[compiler] Make SFI "optimize" flag a "tier up" flag

src/objects.cc

Index: src/objects.cc
diff --git a/src/objects.cc b/src/objects.cc
index 921bb8f7bcac572114d18bf7aeb1e55780cbdf15..2f6fb33e5ef8248f075a1ba127eeb946f30aeb06 100644
--- a/src/objects.cc
+++ b/src/objects.cc
@@ -12198,6 +12198,9 @@ void JSFunction::MarkForBaseline() {
   set_code_no_write_barrier(
       isolate->builtins()->builtin(Builtins::kCompileBaseline));
   // No write barrier required, since the builtin is part of the root set.
+  if (FLAG_tier_up_shared_functions) {
+    shared()->set_was_marked_for_tier_up(true);
+  }
 }
 
 void JSFunction::MarkForOptimization() {
@@ -12208,16 +12211,13 @@ void JSFunction::MarkForOptimization() {
   set_code_no_write_barrier(
       isolate->builtins()->builtin(Builtins::kCompileOptimized));
   // No write barrier required, since the builtin is part of the root set.
+  if (FLAG_tier_up_shared_functions) {
+    shared()->set_was_marked_for_tier_up(true);
+  }
 }
 
 
 void JSFunction::AttemptConcurrentOptimization() {
-  if (FLAG_optimize_shared_functions) {
-    // Mark the shared function for optimization regardless of whether the
-    // optimization is concurrent or not.
-    shared()->set_was_marked_for_optimization(true);
-  }
-
   Isolate* isolate = GetIsolate();
   if (!isolate->concurrent_recompilation_enabled() ||
       isolate->bootstrapper()->IsActive()) {
@@ -12238,6 +12238,9 @@ void JSFunction::AttemptConcurrentOptimization() {
   set_code_no_write_barrier(
       isolate->builtins()->builtin(Builtins::kCompileOptimizedConcurrent));
   // No write barrier required, since the builtin is part of the root set.
+  if (FLAG_tier_up_shared_functions) {
+    shared()->set_was_marked_for_tier_up(true);

[rmcilroy, 2016/10/26 15:07:59]

Could you add the TODO here to mention this doesn't do the optimization
concurrently if we hit the SFI.

[Leszek Swirski, 2016/10/27 09:40:20]

Done.

+  }
 }
 
 // static