commit f1837134518d1e6412dccb94570040f09fc35f0b
author Brian Carlstrom <bdc@google.com> Tue Apr 17 10:29:05 2012 -0700
committer Brian Carlstrom <bdc@google.com> Tue Apr 17 10:29:05 2012 -0700
tree 6cf9b40883c4e73141e4cb0b9a141ec0ebff90c0
parent 2156cc76d440b83383d5cb7454458711a2066913
parent 15077815ccd9b7139a3199fe995d65b7a04a83c9

Merge remote-tracking branch 'goog/dalvik-dev' into jb-release-to-dalvik-dev

src/compiler/codegen/GenInvoke.cc

diff --git a/src/compiler/codegen/GenInvoke.cc b/src/compiler/codegen/GenInvoke.cc
index a904419..d8f1cd4 100644
--- a/src/compiler/codegen/GenInvoke.cc
+++ b/src/compiler/codegen/GenInvoke.cc
@@ -669,7 +669,7 @@
     oatFreeTemp(cUnit, regPtr);
     storeValue(cUnit, rlDest, rlResult);
     if (rangeCheck) {
-        launchPad->operands[2] = NULL;  // no resumption
+        launchPad->operands[2] = 0;  // no resumption
         launchPad->operands[3] = (uintptr_t)bb;
     }
     // Record that we've already inlined & null checked
@@ -858,7 +858,7 @@
                           (intptr_t)launchPad);
     opCmpImmBranch(cUnit, kCondEq, regCmp, 0, launchPad);
     opReg(cUnit, kOpBlx, rTgt);
-    launchPad->operands[2] = NULL;  // No return possible
+    launchPad->operands[2] = 0;  // No return possible
     launchPad->operands[3] = (uintptr_t)bb;
     // Record that we've already inlined & null checked
     mir->optimizationFlags |= (MIR_INLINED | MIR_IGNORE_NULL_CHECK);

src/debugger.cc

diff --git a/src/debugger.cc b/src/debugger.cc
index 1ba0c73..2156482 100644
--- a/src/debugger.cc
+++ b/src/debugger.cc
@@ -592,7 +592,7 @@
   }
   if (c->IsInterface()) {
     // http://code.google.com/p/android/issues/detail?id=20856
-    superclassId = NULL;
+    superclassId = 0;
   } else {
     superclassId = gRegistry->Add(c->GetSuperClass());
   }

src/dex2oat.cc

diff --git a/src/dex2oat.cc b/src/dex2oat.cc
index 6017ddb..9b2ba76 100644
--- a/src/dex2oat.cc
+++ b/src/dex2oat.cc
@@ -214,7 +214,7 @@
     UniquePtr<SirtRef<ClassLoader> > class_loader(new SirtRef<ClassLoader>(NULL));
     if (class_loader.get() == NULL) {
       LOG(ERROR) << "Failed to create SirtRef for class loader";
-      return false;
+      return NULL;
     }
 
     if (!boot_image_option.empty()) {