Rename Runtime_CompileUnoptimized to Runtime_CompileLazy, because that is what it...

R=mstarzinger@chromium.org
BUG=

Review URL: https://codereview.chromium.org/547293004

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@24012 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/arm/builtins-arm.cc b/src/arm/builtins-arm.cc
index 3a4c07a..9d1a72a 100644 (file)
--- a/src/arm/builtins-arm.cc
+++ b/src/arm/builtins-arm.cc
@@ -807,8 +807,8 @@ void Builtins::Generate_JSConstructEntryTrampoline(MacroAssembler* masm) {
 }
 
 
-void Builtins::Generate_CompileUnoptimized(MacroAssembler* masm) {
-  CallRuntimePassFunction(masm, Runtime::kCompileUnoptimized);
+void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
+  CallRuntimePassFunction(masm, Runtime::kCompileLazy);
   GenerateTailCallToReturnedCode(masm);
 }
 

diff --git a/src/arm64/builtins-arm64.cc b/src/arm64/builtins-arm64.cc
index 836ffe1..0013e24 100644 (file)
--- a/src/arm64/builtins-arm64.cc
+++ b/src/arm64/builtins-arm64.cc
@@ -780,8 +780,8 @@ void Builtins::Generate_JSConstructEntryTrampoline(MacroAssembler* masm) {
 }
 
 
-void Builtins::Generate_CompileUnoptimized(MacroAssembler* masm) {
-  CallRuntimePassFunction(masm, Runtime::kCompileUnoptimized);
+void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
+  CallRuntimePassFunction(masm, Runtime::kCompileLazy);
   GenerateTailCallToReturnedCode(masm);
 }
 

diff --git a/src/builtins.h b/src/builtins.h
index a28dd01..4d2fd47 100644 (file)
--- a/src/builtins.h
+++ b/src/builtins.h
@@ -63,105 +63,68 @@ enum BuiltinExtraArguments {
   V(GeneratorPoisonPill, NO_EXTRA_ARGUMENTS)
 
 // Define list of builtins implemented in assembly.
-#define BUILTIN_LIST_A(V)                                               \
-  V(ArgumentsAdaptorTrampoline,     BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(InOptimizationQueue,            BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(JSConstructStubGeneric,         BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(JSConstructStubApi,             BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(JSEntryTrampoline,              BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(JSConstructEntryTrampoline,     BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(CompileUnoptimized,             BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(CompileOptimized,               BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(CompileOptimizedConcurrent,     BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(NotifyDeoptimized,              BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(NotifySoftDeoptimized,          BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(NotifyLazyDeoptimized,          BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(NotifyStubFailure,              BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(NotifyStubFailureSaveDoubles,   BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-                                                                        \
-  V(LoadIC_Miss,                    BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(KeyedLoadIC_Miss,               BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(StoreIC_Miss,                   BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(KeyedStoreIC_Miss,              BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(LoadIC_Getter_ForDeopt,         LOAD_IC, MONOMORPHIC,               \
-                                    kNoExtraICState)                    \
-  V(KeyedLoadIC_Initialize,         KEYED_LOAD_IC, UNINITIALIZED,       \
-                                    kNoExtraICState)                    \
-  V(KeyedLoadIC_PreMonomorphic,     KEYED_LOAD_IC, PREMONOMORPHIC,      \
-                                    kNoExtraICState)                    \
-  V(KeyedLoadIC_Generic,            KEYED_LOAD_IC, GENERIC,             \
-                                    kNoExtraICState)                    \
-  V(KeyedLoadIC_String,             KEYED_LOAD_IC, MEGAMORPHIC,         \
-                                    kNoExtraICState)                    \
-  V(KeyedLoadIC_IndexedInterceptor, KEYED_LOAD_IC, MONOMORPHIC,         \
-                                    kNoExtraICState)                    \
-  V(KeyedLoadIC_SloppyArguments,    KEYED_LOAD_IC, MONOMORPHIC,         \
-                                    kNoExtraICState)                    \
-                                                                        \
-  V(StoreIC_Setter_ForDeopt,        STORE_IC, MONOMORPHIC,              \
-                                    StoreIC::kStrictModeState)          \
-                                                                        \
-  V(KeyedStoreIC_Initialize,        KEYED_STORE_IC, UNINITIALIZED,      \
-                                    kNoExtraICState)                    \
-  V(KeyedStoreIC_PreMonomorphic,    KEYED_STORE_IC, PREMONOMORPHIC,     \
-                                    kNoExtraICState)                    \
-  V(KeyedStoreIC_Generic,           KEYED_STORE_IC, GENERIC,            \
-                                    kNoExtraICState)                    \
-                                                                        \
-  V(KeyedStoreIC_Initialize_Strict, KEYED_STORE_IC, UNINITIALIZED,      \
-                                    StoreIC::kStrictModeState)          \
-  V(KeyedStoreIC_PreMonomorphic_Strict, KEYED_STORE_IC, PREMONOMORPHIC, \
-                                    StoreIC::kStrictModeState)          \
-  V(KeyedStoreIC_Generic_Strict,    KEYED_STORE_IC, GENERIC,            \
-                                    StoreIC::kStrictModeState)          \
-  V(KeyedStoreIC_SloppyArguments,   KEYED_STORE_IC, MONOMORPHIC,        \
-                                    kNoExtraICState)                    \
-                                                                        \
-  /* Uses KeyedLoadIC_Initialize; must be after in list. */             \
-  V(FunctionCall,                   BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(FunctionApply,                  BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-                                                                        \
-  V(InternalArrayCode,              BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(ArrayCode,                      BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-                                                                        \
-  V(StringConstructCode,            BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-                                                                        \
-  V(OnStackReplacement,             BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(InterruptCheck,                 BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(OsrAfterStackCheck,             BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(StackCheck,                     BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-                                                                        \
-  V(MarkCodeAsExecutedOnce,         BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
-  V(MarkCodeAsExecutedTwice,        BUILTIN, UNINITIALIZED,             \
-                                    kNoExtraICState)                    \
+#define BUILTIN_LIST_A(V)                                                      \
+  V(ArgumentsAdaptorTrampoline, BUILTIN, UNINITIALIZED, kNoExtraICState)       \
+  V(InOptimizationQueue, BUILTIN, UNINITIALIZED, kNoExtraICState)              \
+  V(JSConstructStubGeneric, BUILTIN, UNINITIALIZED, kNoExtraICState)           \
+  V(JSConstructStubApi, BUILTIN, UNINITIALIZED, kNoExtraICState)               \
+  V(JSEntryTrampoline, BUILTIN, UNINITIALIZED, kNoExtraICState)                \
+  V(JSConstructEntryTrampoline, BUILTIN, UNINITIALIZED, kNoExtraICState)       \
+  V(CompileLazy, BUILTIN, UNINITIALIZED, kNoExtraICState)                      \
+  V(CompileOptimized, BUILTIN, UNINITIALIZED, kNoExtraICState)                 \
+  V(CompileOptimizedConcurrent, BUILTIN, UNINITIALIZED, kNoExtraICState)       \
+  V(NotifyDeoptimized, BUILTIN, UNINITIALIZED, kNoExtraICState)                \
+  V(NotifySoftDeoptimized, BUILTIN, UNINITIALIZED, kNoExtraICState)            \
+  V(NotifyLazyDeoptimized, BUILTIN, UNINITIALIZED, kNoExtraICState)            \
+  V(NotifyStubFailure, BUILTIN, UNINITIALIZED, kNoExtraICState)                \
+  V(NotifyStubFailureSaveDoubles, BUILTIN, UNINITIALIZED, kNoExtraICState)     \
+                                                                               \
+  V(LoadIC_Miss, BUILTIN, UNINITIALIZED, kNoExtraICState)                      \
+  V(KeyedLoadIC_Miss, BUILTIN, UNINITIALIZED, kNoExtraICState)                 \
+  V(StoreIC_Miss, BUILTIN, UNINITIALIZED, kNoExtraICState)                     \
+  V(KeyedStoreIC_Miss, BUILTIN, UNINITIALIZED, kNoExtraICState)                \
+  V(LoadIC_Getter_ForDeopt, LOAD_IC, MONOMORPHIC, kNoExtraICState)             \
+  V(KeyedLoadIC_Initialize, KEYED_LOAD_IC, UNINITIALIZED, kNoExtraICState)     \
+  V(KeyedLoadIC_PreMonomorphic, KEYED_LOAD_IC, PREMONOMORPHIC,                 \
+    kNoExtraICState)                                                           \
+  V(KeyedLoadIC_Generic, KEYED_LOAD_IC, GENERIC, kNoExtraICState)              \
+  V(KeyedLoadIC_String, KEYED_LOAD_IC, MEGAMORPHIC, kNoExtraICState)           \
+  V(KeyedLoadIC_IndexedInterceptor, KEYED_LOAD_IC, MONOMORPHIC,                \
+    kNoExtraICState)                                                           \
+  V(KeyedLoadIC_SloppyArguments, KEYED_LOAD_IC, MONOMORPHIC, kNoExtraICState)  \
+                                                                               \
+  V(StoreIC_Setter_ForDeopt, STORE_IC, MONOMORPHIC, StoreIC::kStrictModeState) \
+                                                                               \
+  V(KeyedStoreIC_Initialize, KEYED_STORE_IC, UNINITIALIZED, kNoExtraICState)   \
+  V(KeyedStoreIC_PreMonomorphic, KEYED_STORE_IC, PREMONOMORPHIC,               \
+    kNoExtraICState)                                                           \
+  V(KeyedStoreIC_Generic, KEYED_STORE_IC, GENERIC, kNoExtraICState)            \
+                                                                               \
+  V(KeyedStoreIC_Initialize_Strict, KEYED_STORE_IC, UNINITIALIZED,             \
+    StoreIC::kStrictModeState)                                                 \
+  V(KeyedStoreIC_PreMonomorphic_Strict, KEYED_STORE_IC, PREMONOMORPHIC,        \
+    StoreIC::kStrictModeState)                                                 \
+  V(KeyedStoreIC_Generic_Strict, KEYED_STORE_IC, GENERIC,                      \
+    StoreIC::kStrictModeState)                                                 \
+  V(KeyedStoreIC_SloppyArguments, KEYED_STORE_IC, MONOMORPHIC,                 \
+    kNoExtraICState)                                                           \
+                                                                               \
+  /* Uses KeyedLoadIC_Initialize; must be after in list. */                    \
+  V(FunctionCall, BUILTIN, UNINITIALIZED, kNoExtraICState)                     \
+  V(FunctionApply, BUILTIN, UNINITIALIZED, kNoExtraICState)                    \
+                                                                               \
+  V(InternalArrayCode, BUILTIN, UNINITIALIZED, kNoExtraICState)                \
+  V(ArrayCode, BUILTIN, UNINITIALIZED, kNoExtraICState)                        \
+                                                                               \
+  V(StringConstructCode, BUILTIN, UNINITIALIZED, kNoExtraICState)              \
+                                                                               \
+  V(OnStackReplacement, BUILTIN, UNINITIALIZED, kNoExtraICState)               \
+  V(InterruptCheck, BUILTIN, UNINITIALIZED, kNoExtraICState)                   \
+  V(OsrAfterStackCheck, BUILTIN, UNINITIALIZED, kNoExtraICState)               \
+  V(StackCheck, BUILTIN, UNINITIALIZED, kNoExtraICState)                       \
+                                                                               \
+  V(MarkCodeAsExecutedOnce, BUILTIN, UNINITIALIZED, kNoExtraICState)           \
+  V(MarkCodeAsExecutedTwice, BUILTIN, UNINITIALIZED, kNoExtraICState)          \
   CODE_AGE_LIST_WITH_ARG(DECLARE_CODE_AGE_BUILTIN, V)
 
 // Define list of builtin handlers implemented in assembly.
@@ -334,7 +297,7 @@ class Builtins {
   static void Generate_Adaptor(MacroAssembler* masm,
                                CFunctionId id,
                                BuiltinExtraArguments extra_args);
-  static void Generate_CompileUnoptimized(MacroAssembler* masm);
+  static void Generate_CompileLazy(MacroAssembler* masm);
   static void Generate_InOptimizationQueue(MacroAssembler* masm);
   static void Generate_CompileOptimized(MacroAssembler* masm);
   static void Generate_CompileOptimizedConcurrent(MacroAssembler* masm);

diff --git a/src/compiler.cc b/src/compiler.cc
index cd8b75b..074e4a2 100644 (file)
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -714,6 +714,21 @@ MaybeHandle<Code> Compiler::GetUnoptimizedCode(Handle<JSFunction> function) {
   ASSIGN_RETURN_ON_EXCEPTION(info.isolate(), result,
                              GetUnoptimizedCodeCommon(&info),
                              Code);
+  return result;
+}
+
+
+MaybeHandle<Code> Compiler::GetLazyCode(Handle<JSFunction> function) {
+  DCHECK(!function->GetIsolate()->has_pending_exception());
+  DCHECK(!function->is_compiled());
+  if (function->shared()->is_compiled()) {
+    return Handle<Code>(function->shared()->code());
+  }
+
+  CompilationInfoWithZone info(function);
+  Handle<Code> result;
+  ASSIGN_RETURN_ON_EXCEPTION(info.isolate(), result,
+                             GetUnoptimizedCodeCommon(&info), Code);
 
   if (FLAG_always_opt &&
       info.isolate()->use_crankshaft() &&
@@ -744,7 +759,7 @@ MaybeHandle<Code> Compiler::GetUnoptimizedCode(
 bool Compiler::EnsureCompiled(Handle<JSFunction> function,
                               ClearExceptionFlag flag) {
   if (function->is_compiled()) return true;
-  MaybeHandle<Code> maybe_code = Compiler::GetUnoptimizedCode(function);
+  MaybeHandle<Code> maybe_code = Compiler::GetLazyCode(function);
   Handle<Code> code;
   if (!maybe_code.ToHandle(&code)) {
     if (flag == CLEAR_EXCEPTION) {
@@ -767,7 +782,7 @@ bool Compiler::EnsureCompiled(Handle<JSFunction> function,
 // full code without debug break slots to full code with debug break slots
 // depends on the generated code is otherwise exactly the same.
 // If compilation fails, just keep the existing code.
-MaybeHandle<Code> Compiler::GetCodeForDebugging(Handle<JSFunction> function) {
+MaybeHandle<Code> Compiler::GetDebugCode(Handle<JSFunction> function) {
   CompilationInfoWithZone info(function);
   Isolate* isolate = info.isolate();
   VMState<COMPILER> state(isolate);
@@ -1100,7 +1115,7 @@ Handle<SharedFunctionInfo> Compiler::BuildFunctionInfo(
   // Generate code
   Handle<ScopeInfo> scope_info;
   if (FLAG_lazy && allow_lazy && !literal->is_parenthesized()) {
-    Handle<Code> code = isolate->builtins()->CompileUnoptimized();
+    Handle<Code> code = isolate->builtins()->CompileLazy();
     info.SetCode(code);
     scope_info = Handle<ScopeInfo>(ScopeInfo::Empty(isolate));
   } else if (FullCodeGenerator::MakeCode(&info)) {
@@ -1354,8 +1369,7 @@ void Compiler::RecordFunctionCompilation(Logger::LogEventsAndTags tag,
       info->isolate()->cpu_profiler()->is_profiling()) {
     Handle<Script> script = info->script();
     Handle<Code> code = info->code();
-    if (code.is_identical_to(
-            info->isolate()->builtins()->CompileUnoptimized())) {
+    if (code.is_identical_to(info->isolate()->builtins()->CompileLazy())) {
       return;
     }
     int line_num = Script::GetLineNumber(script, shared->start_position()) + 1;

diff --git a/src/compiler.h b/src/compiler.h
index ca64e40..51c8daa 100644 (file)
--- a/src/compiler.h
+++ b/src/compiler.h
@@ -659,11 +659,13 @@ class Compiler : public AllStatic {
  public:
   MUST_USE_RESULT static MaybeHandle<Code> GetUnoptimizedCode(
       Handle<JSFunction> function);
+  MUST_USE_RESULT static MaybeHandle<Code> GetLazyCode(
+      Handle<JSFunction> function);
   MUST_USE_RESULT static MaybeHandle<Code> GetUnoptimizedCode(
       Handle<SharedFunctionInfo> shared);
   static bool EnsureCompiled(Handle<JSFunction> function,
                              ClearExceptionFlag flag);
-  MUST_USE_RESULT static MaybeHandle<Code> GetCodeForDebugging(
+  MUST_USE_RESULT static MaybeHandle<Code> GetDebugCode(
       Handle<JSFunction> function);
 
   static void CompileForLiveEdit(Handle<Script> script);

diff --git a/src/debug.cc b/src/debug.cc
index 6be8fc9..f0e7796 100644 (file)
--- a/src/debug.cc
+++ b/src/debug.cc
@@ -1880,7 +1880,7 @@ static void EnsureFunctionHasDebugBreakSlots(Handle<JSFunction> function) {
   // Make sure that the shared full code is compiled with debug
   // break slots.
   if (!function->shared()->code()->has_debug_break_slots()) {
-    MaybeHandle<Code> code = Compiler::GetCodeForDebugging(function);
+    MaybeHandle<Code> code = Compiler::GetDebugCode(function);
     // Recompilation can fail.  In that case leave the code as it was.
     if (!code.is_null()) function->ReplaceCode(*code.ToHandleChecked());
   } else {
@@ -1914,7 +1914,7 @@ void Debug::PrepareForBreakPoints() {
 
     Deoptimizer::DeoptimizeAll(isolate_);
 
-    Handle<Code> lazy_compile = isolate_->builtins()->CompileUnoptimized();
+    Handle<Code> lazy_compile = isolate_->builtins()->CompileLazy();
 
     // There will be at least one break point when we are done.
     has_break_points_ = true;

diff --git a/src/heap/mark-compact.cc b/src/heap/mark-compact.cc
index 4308412..9f9a658 100644 (file)
--- a/src/heap/mark-compact.cc
+++ b/src/heap/mark-compact.cc
@@ -1024,8 +1024,7 @@ void MarkCompactCollector::Finish() {
 // objects have been marked.
 
 void CodeFlusher::ProcessJSFunctionCandidates() {
-  Code* lazy_compile =
-      isolate_->builtins()->builtin(Builtins::kCompileUnoptimized);
+  Code* lazy_compile = isolate_->builtins()->builtin(Builtins::kCompileLazy);
   Object* undefined = isolate_->heap()->undefined_value();
 
   JSFunction* candidate = jsfunction_candidates_head_;
@@ -1070,8 +1069,7 @@ void CodeFlusher::ProcessJSFunctionCandidates() {
 
 
 void CodeFlusher::ProcessSharedFunctionInfoCandidates() {
-  Code* lazy_compile =
-      isolate_->builtins()->builtin(Builtins::kCompileUnoptimized);
+  Code* lazy_compile = isolate_->builtins()->builtin(Builtins::kCompileLazy);
 
   SharedFunctionInfo* candidate = shared_function_info_candidates_head_;
   SharedFunctionInfo* next_candidate;

diff --git a/src/ia32/builtins-ia32.cc b/src/ia32/builtins-ia32.cc
index 9fd281c..c24e77f 100644 (file)
--- a/src/ia32/builtins-ia32.cc
+++ b/src/ia32/builtins-ia32.cc
@@ -550,8 +550,8 @@ void Builtins::Generate_JSConstructEntryTrampoline(MacroAssembler* masm) {
 }
 
 
-void Builtins::Generate_CompileUnoptimized(MacroAssembler* masm) {
-  CallRuntimePassFunction(masm, Runtime::kCompileUnoptimized);
+void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
+  CallRuntimePassFunction(masm, Runtime::kCompileLazy);
   GenerateTailCallToReturnedCode(masm);
 }
 

diff --git a/src/log.cc b/src/log.cc
index 0c6c435..11c7a88 100644 (file)
--- a/src/log.cc
+++ b/src/log.cc
@@ -1221,8 +1221,7 @@ void Logger::CodeCreateEvent(LogEventsAndTags tag,
   CALL_LISTENERS(CodeCreateEvent(tag, code, shared, info, name));
 
   if (!FLAG_log_code || !log_->IsEnabled()) return;
-  if (code == isolate_->builtins()->builtin(Builtins::kCompileUnoptimized))
-    return;
+  if (code == isolate_->builtins()->builtin(Builtins::kCompileLazy)) return;
 
   Log::MessageBuilder msg(log_);
   AppendCodeCreateHeader(&msg, tag, code);
@@ -1755,8 +1754,7 @@ void Logger::LogCompiledFunctions() {
   // During iteration, there can be heap allocation due to
   // GetScriptLineNumber call.
   for (int i = 0; i < compiled_funcs_count; ++i) {
-    if (code_objects[i].is_identical_to(
-            isolate_->builtins()->CompileUnoptimized()))
+    if (code_objects[i].is_identical_to(isolate_->builtins()->CompileLazy()))
       continue;
     LogExistingFunction(sfis[i], code_objects[i]);
   }

diff --git a/src/mips/builtins-mips.cc b/src/mips/builtins-mips.cc
index f6785d2..2813dd4 100644 (file)
--- a/src/mips/builtins-mips.cc
+++ b/src/mips/builtins-mips.cc
@@ -824,8 +824,8 @@ void Builtins::Generate_JSConstructEntryTrampoline(MacroAssembler* masm) {
 }
 
 
-void Builtins::Generate_CompileUnoptimized(MacroAssembler* masm) {
-  CallRuntimePassFunction(masm, Runtime::kCompileUnoptimized);
+void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
+  CallRuntimePassFunction(masm, Runtime::kCompileLazy);
   GenerateTailCallToReturnedCode(masm);
 }
 

diff --git a/src/mips64/builtins-mips64.cc b/src/mips64/builtins-mips64.cc
index 91dcfc8..5bdb56c 100644 (file)
--- a/src/mips64/builtins-mips64.cc
+++ b/src/mips64/builtins-mips64.cc
@@ -839,8 +839,8 @@ void Builtins::Generate_JSConstructEntryTrampoline(MacroAssembler* masm) {
 }
 
 
-void Builtins::Generate_CompileUnoptimized(MacroAssembler* masm) {
-  CallRuntimePassFunction(masm, Runtime::kCompileUnoptimized);
+void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
+  CallRuntimePassFunction(masm, Runtime::kCompileLazy);
   GenerateTailCallToReturnedCode(masm);
 }
 

diff --git a/src/objects-inl.h b/src/objects-inl.h
index 20a12b6..4840b2d 100644 (file)
--- a/src/objects-inl.h
+++ b/src/objects-inl.h
@@ -5667,8 +5667,7 @@ void SharedFunctionInfo::set_scope_info(ScopeInfo* value,
 
 
 bool SharedFunctionInfo::is_compiled() {
-  return code() !=
-      GetIsolate()->builtins()->builtin(Builtins::kCompileUnoptimized);
+  return code() != GetIsolate()->builtins()->builtin(Builtins::kCompileLazy);
 }
 
 
@@ -5942,8 +5941,7 @@ bool JSFunction::should_have_prototype() {
 
 
 bool JSFunction::is_compiled() {
-  return code() !=
-      GetIsolate()->builtins()->builtin(Builtins::kCompileUnoptimized);
+  return code() != GetIsolate()->builtins()->builtin(Builtins::kCompileLazy);
 }
 
 

diff --git a/src/runtime.cc b/src/runtime.cc
index 330225d..4c8723c 100644 (file)
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -8405,7 +8405,7 @@ RUNTIME_FUNCTION(Runtime_FinalizeInstanceSize) {
 }
 
 
-RUNTIME_FUNCTION(Runtime_CompileUnoptimized) {
+RUNTIME_FUNCTION(Runtime_CompileLazy) {
   HandleScope scope(isolate);
   DCHECK(args.length() == 1);
   CONVERT_ARG_HANDLE_CHECKED(JSFunction, function, 0);
@@ -8422,7 +8422,7 @@ RUNTIME_FUNCTION(Runtime_CompileUnoptimized) {
 
   Handle<Code> code;
   ASSIGN_RETURN_FAILURE_ON_EXCEPTION(isolate, code,
-                                     Compiler::GetUnoptimizedCode(function));
+                                     Compiler::GetLazyCode(function));
   function->ReplaceCode(*code);
 
   // All done. Return the compiled code.

diff --git a/src/runtime.h b/src/runtime.h
index 4f11c2e..56038ce 100644 (file)
--- a/src/runtime.h
+++ b/src/runtime.h
@@ -419,90 +419,90 @@ namespace internal {
   F(ForInCacheArrayLength, 2, 1) /* TODO(turbofan): Only temporary */
 
 
-#define RUNTIME_FUNCTION_LIST_ALWAYS_3(F)                            \
-  /* String and Regexp */                                            \
-  F(NumberToStringRT, 1, 1)                                          \
-  F(RegExpConstructResult, 3, 1)                                     \
-  F(RegExpExecRT, 4, 1)                                              \
-  F(StringAdd, 2, 1)                                                 \
-  F(SubString, 3, 1)                                                 \
-  F(InternalizeString, 1, 1)                                         \
-  F(StringCompare, 2, 1)                                             \
-  F(StringCharCodeAtRT, 2, 1)                                        \
-  F(GetFromCache, 2, 1)                                              \
-                                                                     \
-  /* Compilation */                                                  \
-  F(CompileUnoptimized, 1, 1)                                        \
-  F(CompileOptimized, 2, 1)                                          \
-  F(TryInstallOptimizedCode, 1, 1)                                   \
-  F(NotifyDeoptimized, 1, 1)                                         \
-  F(NotifyStubFailure, 0, 1)                                         \
-                                                                     \
-  /* Utilities */                                                    \
-  F(AllocateInNewSpace, 1, 1)                                        \
-  F(AllocateInTargetSpace, 2, 1)                                     \
-  F(AllocateHeapNumber, 0, 1)                                        \
-  F(NumberToSmi, 1, 1)                                               \
-  F(NumberToStringSkipCache, 1, 1)                                   \
-                                                                     \
-  F(NewArguments, 1, 1) /* TODO(turbofan): Only temporary */         \
-  F(NewSloppyArguments, 3, 1)                                        \
-  F(NewStrictArguments, 3, 1)                                        \
-                                                                     \
-  /* Harmony generators */                                           \
-  F(CreateJSGeneratorObject, 0, 1)                                   \
-  F(SuspendJSGeneratorObject, 1, 1)                                  \
-  F(ResumeJSGeneratorObject, 3, 1)                                   \
-  F(ThrowGeneratorStateError, 1, 1)                                  \
-                                                                     \
-  /* Arrays */                                                       \
-  F(ArrayConstructor, -1, 1)                                         \
-  F(InternalArrayConstructor, -1, 1)                                 \
-                                                                     \
-  /* Literals */                                                     \
-  F(MaterializeRegExpLiteral, 4, 1)                                  \
-  F(CreateObjectLiteral, 4, 1)                                       \
-  F(CreateArrayLiteral, 4, 1)                                        \
-  F(CreateArrayLiteralStubBailout, 3, 1)                             \
-                                                                     \
-  /* Statements */                                                   \
-  F(NewClosure, 3, 1)                                                \
-  F(NewClosureFromStubFailure, 1, 1)                                 \
-  F(NewObject, 1, 1)                                                 \
-  F(NewObjectWithAllocationSite, 2, 1)                               \
-  F(FinalizeInstanceSize, 1, 1)                                      \
-  F(Throw, 1, 1)                                                     \
-  F(ReThrow, 1, 1)                                                   \
-  F(ThrowReferenceError, 1, 1)                                       \
-  F(ThrowNotDateError, 0, 1)                                         \
-  F(StackGuard, 0, 1)                                                \
-  F(Interrupt, 0, 1)                                                 \
-  F(PromoteScheduledException, 0, 1)                                 \
-                                                                     \
-  /* Contexts */                                                     \
-  F(NewGlobalContext, 2, 1)                                          \
-  F(NewFunctionContext, 1, 1)                                        \
-  F(PushWithContext, 2, 1)                                           \
-  F(PushCatchContext, 3, 1)                                          \
-  F(PushBlockContext, 2, 1)                                          \
-  F(PushModuleContext, 2, 1)                                         \
-  F(DeleteLookupSlot, 2, 1)                                          \
-  F(LoadLookupSlot, 2, 2)                                            \
-  F(LoadLookupSlotNoReferenceError, 2, 2)                            \
-  F(StoreLookupSlot, 4, 1)                                           \
-                                                                     \
-  /* Declarations and initialization */                              \
-  F(DeclareGlobals, 3, 1)                                            \
-  F(DeclareModules, 1, 1)                                            \
-  F(DeclareLookupSlot, 4, 1)                                         \
-  F(InitializeConstGlobal, 2, 1)                                     \
-  F(InitializeLegacyConstLookupSlot, 3, 1)                           \
-                                                                     \
-  /* Eval */                                                         \
-  F(ResolvePossiblyDirectEval, 5, 2)                                 \
-                                                                     \
-  /* Maths */                                                        \
-  F(MathPowSlow, 2, 1)                                               \
+#define RUNTIME_FUNCTION_LIST_ALWAYS_3(F)                    \
+  /* String and Regexp */                                    \
+  F(NumberToStringRT, 1, 1)                                  \
+  F(RegExpConstructResult, 3, 1)                             \
+  F(RegExpExecRT, 4, 1)                                      \
+  F(StringAdd, 2, 1)                                         \
+  F(SubString, 3, 1)                                         \
+  F(InternalizeString, 1, 1)                                 \
+  F(StringCompare, 2, 1)                                     \
+  F(StringCharCodeAtRT, 2, 1)                                \
+  F(GetFromCache, 2, 1)                                      \
+                                                             \
+  /* Compilation */                                          \
+  F(CompileLazy, 1, 1)                                       \
+  F(CompileOptimized, 2, 1)                                  \
+  F(TryInstallOptimizedCode, 1, 1)                           \
+  F(NotifyDeoptimized, 1, 1)                                 \
+  F(NotifyStubFailure, 0, 1)                                 \
+                                                             \
+  /* Utilities */                                            \
+  F(AllocateInNewSpace, 1, 1)                                \
+  F(AllocateInTargetSpace, 2, 1)                             \
+  F(AllocateHeapNumber, 0, 1)                                \
+  F(NumberToSmi, 1, 1)                                       \
+  F(NumberToStringSkipCache, 1, 1)                           \
+                                                             \
+  F(NewArguments, 1, 1) /* TODO(turbofan): Only temporary */ \
+  F(NewSloppyArguments, 3, 1)                                \
+  F(NewStrictArguments, 3, 1)                                \
+                                                             \
+  /* Harmony generators */                                   \
+  F(CreateJSGeneratorObject, 0, 1)                           \
+  F(SuspendJSGeneratorObject, 1, 1)                          \
+  F(ResumeJSGeneratorObject, 3, 1)                           \
+  F(ThrowGeneratorStateError, 1, 1)                          \
+                                                             \
+  /* Arrays */                                               \
+  F(ArrayConstructor, -1, 1)                                 \
+  F(InternalArrayConstructor, -1, 1)                         \
+                                                             \
+  /* Literals */                                             \
+  F(MaterializeRegExpLiteral, 4, 1)                          \
+  F(CreateObjectLiteral, 4, 1)                               \
+  F(CreateArrayLiteral, 4, 1)                                \
+  F(CreateArrayLiteralStubBailout, 3, 1)                     \
+                                                             \
+  /* Statements */                                           \
+  F(NewClosure, 3, 1)                                        \
+  F(NewClosureFromStubFailure, 1, 1)                         \
+  F(NewObject, 1, 1)                                         \
+  F(NewObjectWithAllocationSite, 2, 1)                       \
+  F(FinalizeInstanceSize, 1, 1)                              \
+  F(Throw, 1, 1)                                             \
+  F(ReThrow, 1, 1)                                           \
+  F(ThrowReferenceError, 1, 1)                               \
+  F(ThrowNotDateError, 0, 1)                                 \
+  F(StackGuard, 0, 1)                                        \
+  F(Interrupt, 0, 1)                                         \
+  F(PromoteScheduledException, 0, 1)                         \
+                                                             \
+  /* Contexts */                                             \
+  F(NewGlobalContext, 2, 1)                                  \
+  F(NewFunctionContext, 1, 1)                                \
+  F(PushWithContext, 2, 1)                                   \
+  F(PushCatchContext, 3, 1)                                  \
+  F(PushBlockContext, 2, 1)                                  \
+  F(PushModuleContext, 2, 1)                                 \
+  F(DeleteLookupSlot, 2, 1)                                  \
+  F(LoadLookupSlot, 2, 2)                                    \
+  F(LoadLookupSlotNoReferenceError, 2, 2)                    \
+  F(StoreLookupSlot, 4, 1)                                   \
+                                                             \
+  /* Declarations and initialization */                      \
+  F(DeclareGlobals, 3, 1)                                    \
+  F(DeclareModules, 1, 1)                                    \
+  F(DeclareLookupSlot, 4, 1)                                 \
+  F(InitializeConstGlobal, 2, 1)                             \
+  F(InitializeLegacyConstLookupSlot, 3, 1)                   \
+                                                             \
+  /* Eval */                                                 \
+  F(ResolvePossiblyDirectEval, 5, 2)                         \
+                                                             \
+  /* Maths */                                                \
+  F(MathPowSlow, 2, 1)                                       \
   F(MathPowRT, 2, 1)
 
 

diff --git a/src/x64/builtins-x64.cc b/src/x64/builtins-x64.cc
index 986f7bf..194d8a6 100644 (file)
--- a/src/x64/builtins-x64.cc
+++ b/src/x64/builtins-x64.cc
@@ -609,8 +609,8 @@ void Builtins::Generate_JSConstructEntryTrampoline(MacroAssembler* masm) {
 }
 
 
-void Builtins::Generate_CompileUnoptimized(MacroAssembler* masm) {
-  CallRuntimePassFunction(masm, Runtime::kCompileUnoptimized);
+void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
+  CallRuntimePassFunction(masm, Runtime::kCompileLazy);
   GenerateTailCallToReturnedCode(masm);
 }
 

diff --git a/src/x87/builtins-x87.cc b/src/x87/builtins-x87.cc
index 3139518..6857cdc 100644 (file)
--- a/src/x87/builtins-x87.cc
+++ b/src/x87/builtins-x87.cc
@@ -550,8 +550,8 @@ void Builtins::Generate_JSConstructEntryTrampoline(MacroAssembler* masm) {
 }
 
 
-void Builtins::Generate_CompileUnoptimized(MacroAssembler* masm) {
-  CallRuntimePassFunction(masm, Runtime::kCompileUnoptimized);
+void Builtins::Generate_CompileLazy(MacroAssembler* masm) {
+  CallRuntimePassFunction(masm, Runtime::kCompileLazy);
   GenerateTailCallToReturnedCode(masm);
 }
 

diff --git a/test/cctest/test-heap-profiler.cc b/test/cctest/test-heap-profiler.cc
index 80f0279..8f9b484 100644 (file)
--- a/test/cctest/test-heap-profiler.cc
+++ b/test/cctest/test-heap-profiler.cc
@@ -2362,15 +2362,12 @@ TEST(CheckCodeNames) {
   node = GetNodeByPath(snapshot, builtin_path1, arraysize(builtin_path1));
   CHECK_NE(NULL, node);
 
-  const char* builtin_path2[] = {
-    "::(GC roots)",
-    "::(Builtins)",
-    "::(CompileUnoptimized builtin)"
-  };
+  const char* builtin_path2[] = {"::(GC roots)", "::(Builtins)",
+                                 "::(CompileLazy builtin)"};
   node = GetNodeByPath(snapshot, builtin_path2, arraysize(builtin_path2));
   CHECK_NE(NULL, node);
   v8::String::Utf8Value node_name(node->GetName());
-  CHECK_EQ("(CompileUnoptimized builtin)", *node_name);
+  CHECK_EQ("(CompileLazy builtin)", *node_name);
 }
 
 

diff --git a/test/fuzz-natives/fuzz-natives.status b/test/fuzz-natives/fuzz-natives.status
index 7165c38..c81188a 100644 (file)
--- a/test/fuzz-natives/fuzz-natives.status
+++ b/test/fuzz-natives/fuzz-natives.status
@@ -33,7 +33,7 @@
 
   # TODO(danno): Fix these internal function that are only callable form stubs
   # and un-blacklist them!
-  "CompileUnoptimized": [SKIP],
+  "CompileLazy": [SKIP],
   "NotifyDeoptimized": [SKIP],
   "NotifyStubFailure": [SKIP],
   "NewSloppyArguments": [SKIP],