commit 017ed0b936539dba1bb6f1d9b2bd81798b471966
author Mathieu Chartier <mathieuc@google.com> Tue Sep 22 11:04:26 2015 -0700
committer Mathieu Chartier <mathieuc@google.com> Tue Sep 22 11:04:26 2015 -0700
tree 24cee7c2bafe0d931081d3869cfc7ca78f748e47
parent b64d5832879f462ed146f0b012ea0bf62255b643

Fix CreateLinearAlloc bug

Should have been using IsAotCompiler since the JIT has IsCompiler
as true but no low 4 GB arena pool.

Fixes 64 bit JIT tests.

Change-Id: Idc4d3e66c573eacd31ae85c66f8493b418d221d7

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index fe97394..8cba1a9 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -944,7 +944,7 @@
   // can't be trimmed as easily.
   const bool use_malloc = IsAotCompiler();
   arena_pool_.reset(new ArenaPool(use_malloc, false));
-  if (IsCompiler() && Is64BitInstructionSet(kRuntimeISA)) {
+  if (IsAotCompiler() && Is64BitInstructionSet(kRuntimeISA)) {
     // 4gb, no malloc. Explanation in header.
     low_4gb_arena_pool_.reset(new ArenaPool(false, true));
   }
@@ -1790,7 +1790,7 @@
 }
 
 LinearAlloc* Runtime::CreateLinearAlloc() {
-  return (IsCompiler() && Is64BitInstructionSet(kRuntimeISA))
+  return (IsAotCompiler() && Is64BitInstructionSet(kRuntimeISA))
       ? new LinearAlloc(low_4gb_arena_pool_.get())
       : new LinearAlloc(arena_pool_.get());
 }