Merge branch 'master' into llvm-svn

3 files changed, 37 insertions, 16 deletions

diff --git a/tools/bindings_generator.py b/tools/bindings_generator.py
index deba8930..66462b6d 100755
--- a/tools/bindings_generator.py
+++ b/tools/bindings_generator.py
@@ -359,20 +359,21 @@ gen_c.write('extern "C" {\n')
 # Having this object saves us needing to do checks for the object being null each time in the bindings code.
 gen_js.write('''
 // Bindings utilities
-var Object__cache = {};
-function wrapPointer(ptr, class_) {
-  var cache = class_ ? class_.prototype.__cache__ : Object__cache;
+var Object__cache = {}; // we do it this way so we do not modify |Object|
+function wrapPointer(ptr, __class__) {
+  var cache = __class__ ? __class__.prototype.__cache__ : Object__cache;
   var ret = cache[ptr];
   if (ret) return ret;
-  class_ = class_ || Object;
-  ret = Object.create(class_.prototype);
+  __class__ = __class__ || Object;
+  ret = Object.create(__class__.prototype);
   ret.ptr = ptr;
+  ret.__class__ = __class__;
   return cache[ptr] = ret;
 }
 this['wrapPointer'] = wrapPointer;
 
-function castObject(obj, class_) {
-  return wrapPointer(obj.ptr, class_);
+function castObject(obj, __class__) {
+  return wrapPointer(obj.ptr, __class__);
 }
 this['castObject'] = castObject;
 
@@ -381,6 +382,12 @@ this['NULL'] = wrapPointer(0);
 function destroy(obj) {
   if (!obj['__destroy__']) throw 'Error: Cannot destroy object. (Did you create it yourself?)';
   obj['__destroy__']();
+  // Remove from cache, so the object can be GC'd and refs added onto it released
+  if (obj.__class__ !== Object) {
+    delete obj.__class__.prototype.__cache__[obj.ptr];
+  } else {
+    delete Object__cache[obj.ptr];
+  }
 }
 this['destroy'] = destroy;
 
@@ -393,6 +400,11 @@ function getPointer(obj) {
   return obj.ptr;
 }
 this['getPointer'] = getPointer;
+
+function getClass(obj) {
+  return obj.__class__;
+}
+this['getClass'] = getClass;
 ''')
 
 def generate_wrapping_code(classname):
@@ -564,6 +576,9 @@ def generate_class(generating_classname, classname, clazz): # TODO: deprecate ge
 
     print 'Maekin:', classname, generating_classname, mname, mname_suffixed
     if constructor:
+      calls += '''
+  %s.prototype.__cache__[this.ptr] = this;
+  this.__class__ = %s;''' % (mname_suffixed, mname_suffixed)
       if not dupe:
         js_text = '''
 function %s(%s) {
diff --git a/tools/emmaken.py b/tools/emmaken.py
index 8539d7b6..76c2e9c8 100755
--- a/tools/emmaken.py
+++ b/tools/emmaken.py
@@ -17,10 +17,14 @@ Example uses:
 
  * With configure, do something like
 
-    RANLIB=PATH/emmaken.py AR=PATH/emmaken.py CXX=PATH/emmaken.py CC=PATH/emmaken.py ./configure [options]
+    EMMAKEN_JUST_CONFIGURE=1 RANLIB=PATH/emmaken.py AR=PATH/emmaken.py CXX=PATH/emmaken.py CC=PATH/emmaken.py ./configure [options]
 
    where PATH is the path to this file.
 
+   EMMAKEN_JUST_CONFIGURE tells emmaken that it is being run in ./configure,
+   so it should relay everything to gcc/g++. You should not define that when
+   running make, of course.
+
  * With CMake, the same command will work (with cmake instead of ./configure). You may also be
    able to do the following in your CMakeLists.txt:
 
@@ -53,20 +57,21 @@ import sys
 import os
 import subprocess
 
+print >> sys.stderr, 'emmaken.py: ', ' '.join(sys.argv)
+
 abspath = os.path.abspath(os.path.dirname(__file__))
 def path_from_root(*pathelems):
   return os.path.join(os.path.sep, *(abspath.split(os.sep)[:-1] + list(pathelems)))
 exec(open(path_from_root('tools', 'shared.py'), 'r').read())
 
-# If this is a CMake config, just do that
+# If this is a configure-type thing, just do that
+CONFIGURE_CONFIG = os.environ.get('EMMAKEN_JUST_CONFIGURE')
 CMAKE_CONFIG = 'CMakeFiles/cmTryCompileExec.dir' in ' '.join(sys.argv)# or 'CMakeCCompilerId' in ' '.join(sys.argv)
-if CMAKE_CONFIG:
+if CONFIGURE_CONFIG or CMAKE_CONFIG:
   compiler = 'g++' if 'CXXCompiler' in ' '.join(sys.argv) else 'gcc'
   exit(os.execvp(compiler, [compiler] + sys.argv[1:]))
 
 try:
-  print >> sys.stderr, 'emmaken.py: ', ' '.join(sys.argv)
-
   #f=open('/dev/shm/tmp/waka.txt', 'a')
   #f.write('Args: ' + ' '.join(sys.argv) + '\nCMake? ' + str(CMAKE_CONFIG) + '\n')
   #f.close()
@@ -97,7 +102,6 @@ try:
 
   if len(sys.argv) == 2 and 'conftest' not in ' '.join(sys.argv): # Avoid messing with configure, see below too
     # ranlib
-    os.execvp(LLVM_DIS, ['-show-annotations', sys.argv[1]])
     sys.exit(0)
   if len(sys.argv) == 1 or sys.argv[1] in ['x', 't']:
     # noop ar
@@ -116,7 +120,7 @@ try:
       files.append(arg)
       if arg.endswith('.c'):
         use_cxx = False
-      if arg.endswith(('.c', '.cc', '.cpp')):
+      if arg.endswith(('.c', '.cc', '.cpp', '.dT')):
         use_linker = False
       if arg.endswith('.h'):
         header = True
@@ -130,8 +134,8 @@ try:
     assert use_linker, 'Linker should be used in this case'
 
   if use_linker:
-    call = LLVM_LINK
-    newargs = []
+    call = LLVM_LD
+    newargs = ['-disable-opt']
     found_o = False
     i = 0
     while i < len(sys.argv)-1:
@@ -163,6 +167,7 @@ try:
       if not use_linker:
         newargs.append('-c') 
   else:
+    print >> sys.stderr, 'Just copy.'
     shutil.copy(sys.argv[-1], sys.argv[-2])
     exit(0)
 
diff --git a/tools/shared.py b/tools/shared.py
index ce42d794..cc466e68 100644
--- a/tools/shared.py
+++ b/tools/shared.py
@@ -14,6 +14,7 @@ exec(open(CONFIG_FILE, 'r').read())
 
 CLANG=os.path.expanduser(os.path.join(LLVM_ROOT, 'clang++'))
 LLVM_LINK=os.path.join(LLVM_ROOT, 'llvm-link')
+LLVM_LD=os.path.join(LLVM_ROOT, 'llvm-ld')
 LLVM_OPT=os.path.expanduser(os.path.join(LLVM_ROOT, 'opt'))
 LLVM_AS=os.path.expanduser(os.path.join(LLVM_ROOT, 'llvm-as'))
 LLVM_DIS=os.path.expanduser(os.path.join(LLVM_ROOT, 'llvm-dis'))