Reland "Make --always-opt also optimize toplevel code."

test/cctest/test-parsing.cc

Index: test/cctest/test-parsing.cc
diff --git a/test/cctest/test-parsing.cc b/test/cctest/test-parsing.cc
index 74ece30680ad3927d7eab8a1a4904f96d5c3e291..0061ba4940c319a3690e75b380944c00b3e763ab 100644
--- a/test/cctest/test-parsing.cc
+++ b/test/cctest/test-parsing.cc
@@ -3163,8 +3163,8 @@ namespace {
 
 int* global_use_counts = NULL;
 
-void MockUseCounterCallback(v8::Isolate* isolate,
-                            v8::Isolate::UseCounterFeature feature) {
+void UseCounterCallback(v8::Isolate* isolate,
+                        v8::Isolate::UseCounterFeature feature) {
   ++global_use_counts[feature];
 }
 
@@ -3177,12 +3177,13 @@ TEST(UseAsmUseCount) {
   LocalContext env;
   int use_counts[v8::Isolate::kUseCounterFeatureCount] = {};
   global_use_counts = use_counts;
-  CcTest::isolate()->SetUseCounterCallback(MockUseCounterCallback);
+  CcTest::isolate()->SetUseCounterCallback(UseCounterCallback);
   CompileRun("\"use asm\";\n"
              "var foo = 1;\n"
              "\"use asm\";\n"  // Only the first one counts.
              "function bar() { \"use asm\"; var baz = 1; }");
-  CHECK_EQ(2, use_counts[v8::Isolate::kUseAsm]);
+  // Optimizing will double-count because the source is parsed twice.
+  CHECK_EQ(i::FLAG_always_opt ? 4 : 2, use_counts[v8::Isolate::kUseAsm]);
 }