am 39796a6a: am 30febfdf: Merge remote branch \'goog/dalvik-dev\' into dalvik-dev-to-gingerbread

Merge commit '39796a6aa79f687ac0b1254f6a8be048ad1243d8'

* commit '39796a6aa79f687ac0b1254f6a8be048ad1243d8': (26 commits)
  Remove an assertion that cannot be guaranteed.
  Always support debugging and profiling.
  Fix a critical space leak introduced by concurrent sweeping.
  Add a little bit of paranoia to the odex data reader.
  Nudge a couple of log messages.
  Fix build breakage caused by the countInstancesOfClass change.
  Add a method for counting the extant instances of a class.
  Added fsync call to dexopt.
  JIT: Fix for armv5te-VFP bug [Issue 2916682]
  Cast to a byte pointer before performing arithmetic.
  Limit scanning to cards within the committed region of the heap.
  Remove a malfunctioning predicate used only in assertions.
  Remove debugging code and stale comments from the sweep callback.
  Fix build breakage caused by a bad merge from master.
  JIT: Correct conversion of cb[n]z to cmp/cond_br pair
  Print callee information in the JIT profile outout
  JIT: Fix for lightweight assembler retry mechanism.
  JIT: Fix for 2898397 assert in JIT (chain cell offset)
  More SMP fixes.
  Fix some potential SMP issues.
  ...

1 files changed, 8 insertions, 2 deletions

diff --git a/vm/compiler/codegen/arm/CodegenDriver.c b/vm/compiler/codegen/arm/CodegenDriver.c
index a1e54496e..1ff94096e 100644
--- a/vm/compiler/codegen/arm/CodegenDriver.c
+++ b/vm/compiler/codegen/arm/CodegenDriver.c
@@ -4339,14 +4339,14 @@ bool dvmCompilerDoWork(CompilerWorkOrder *work)
         case kWorkOrderTrace:
             /* Start compilation with maximally allowed trace length */
             res = dvmCompileTrace(work->info, JIT_MAX_TRACE_LEN, &work->result,
-                                  work->bailPtr);
+                                  work->bailPtr, 0 /* no hints */);
             break;
         case kWorkOrderTraceDebug: {
             bool oldPrintMe = gDvmJit.printMe;
             gDvmJit.printMe = true;
             /* Start compilation with maximally allowed trace length */
             res = dvmCompileTrace(work->info, JIT_MAX_TRACE_LEN, &work->result,
-                                  work->bailPtr);
+                                  work->bailPtr, 0 /* no hints */);
             gDvmJit.printMe = oldPrintMe;
             break;
         }
@@ -4426,6 +4426,12 @@ void *dvmCompilerGetInterpretTemplate()
                       templateEntryOffsets[TEMPLATE_INTERPRET]);
 }
 
+/* Needed by the Assembler */
+void dvmCompilerSetupResourceMasks(ArmLIR *lir)
+{
+    setupResourceMasks(lir);
+}
+
 /* Needed by the ld/st optmizatons */
 ArmLIR* dvmCompilerRegCopyNoInsert(CompilationUnit *cUnit, int rDest, int rSrc)
 {