Only test optimizing compilation in helper thread compilation test.

runtime/vm/compiler_test.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/assert.h"
 #include "vm/class_finalizer.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/dart_api_impl.h"
 #include "vm/object.h"
@@ skipping 11 matching lines @@
   String& url = String::Handle(String::New("dart-test:CompileScript"));
   String& source = String::Handle(String::New(kScriptChars));
   Script& script = Script::Handle(Script::New(url,
                                               source,
                                               RawScript::kScriptTag));
   Library& lib = Library::Handle(Library::CoreLibrary());
   EXPECT(CompilerTest::TestCompileScript(lib, script));
 }
 
 
-static void CompileFunctionImpl() {
+TEST_CASE(CompileFunction) {
   const char* kScriptChars =
             "class A {\n"
             "  static foo() { return 42; }\n"
             "  static moo() {\n"
             "    // A.foo();\n"
             "  }\n"
             "}\n";
   String& url = String::Handle(String::New("dart-test:CompileFunction"));
   String& source = String::Handle(String::New(kScriptChars));
   Script& script = Script::Handle(Script::New(url,
@@ skipping 20 matching lines @@
   EXPECT(!function_moo.IsNull());
 
   EXPECT(CompilerTest::TestCompileFunction(function_moo));
   EXPECT(function_moo.HasCode());
   function_source = function_moo.GetSource();
   EXPECT_STREQ("static moo() {\n    // A.foo();\n  }",
                function_source.ToCString());
 }
 
 
-TEST_CASE(CompileFunction) {
-  CompileFunctionImpl();
-}
-
-
-// Runs 'CompileFunctionImpl' on a helper thread.
 class CompileFunctionTask : public ThreadPool::Task {
  public:
   CompileFunctionTask(Isolate* isolate,
-                 Monitor* done_monitor,
-                 bool* done)
+                      const Function& func,
+                      Monitor* done_monitor,
+                      bool* done)
       : isolate_(isolate),
+        func_(func),
         done_monitor_(done_monitor),
         done_(done) {
   }
 
   virtual void Run() {
     Thread::EnterIsolateAsHelper(isolate_);
     {
       Thread* thread = Thread::Current();
       StackZone stack_zone(thread);
       HANDLESCOPE(thread);
-      CompileFunctionImpl();
+      EXPECT(!func_.HasOptimizedCode());

[srdjan, 2015/08/18 23:07:18]

Assert that function has (unoptimized) code. We expect certain objects to be
allocated/computed  during unoptimized compilation before we can use them in
optimized compilation.

[koda, 2015/08/19 00:16:32]

Yes, although I'm already doing that in the code below, it does make sense to do
it again here, if it's a precondition of the method we're calling.

+      const Error& err =
+          Error::Handle(Compiler::CompileOptimizedFunction(thread, func_));
+      EXPECT(err.IsNull());
+      EXPECT(func_.HasOptimizedCode());
     }
     Thread::ExitIsolateAsHelper();
     // Tell main thread that we are done.
     {
       MonitorLocker ml(done_monitor_);
       ASSERT(!*done_);
       *done_ = true;
       ml.Notify();
     }
   }
 
  private:
   Isolate* isolate_;
+  const Function& func_;
   Monitor* done_monitor_;
   bool* done_;
 };
 
 
 TEST_CASE(CompileFunctionOnHelperThread) {
   Monitor done_monitor;
   bool done = false;
   Isolate* isolate = Thread::Current()->isolate();
   // Flush store buffers, etc.
   // TODO(koda): Currently, the GC only does this for the current thread, (i.e,
   // the helper, in this test), but it should be done for all *threads*
   // after/at safepointing.
   Thread::PrepareForGC();
+
+  // Create a simple function and compile it without optimization.
+  const char* kScriptChars =
+            "class A {\n"
+            "  static foo() { return 42; }\n"
+            "}\n";
+  String& url =
+      String::Handle(String::New("dart-test:CompileFunctionOnHelperThread"));
+  String& source = String::Handle(String::New(kScriptChars));
+  Script& script = Script::Handle(Script::New(url,
+                                              source,
+                                              RawScript::kScriptTag));
+  Library& lib = Library::Handle(Library::CoreLibrary());
+  EXPECT(CompilerTest::TestCompileScript(lib, script));
+  EXPECT(ClassFinalizer::ProcessPendingClasses());
+  Class& cls = Class::Handle(
+      lib.LookupClass(String::Handle(Symbols::New("A"))));
+  EXPECT(!cls.IsNull());
+  String& function_foo_name = String::Handle(String::New("foo"));
+  Function& func =
+      Function::Handle(cls.LookupStaticFunction(function_foo_name));
+  EXPECT(!func.HasCode());
+  CompilerTest::TestCompileFunction(func);
+  EXPECT(func.HasCode());
+  EXPECT(!func.HasOptimizedCode());
+
+  // Now optimize it on a helper thread.
   Dart::thread_pool()->Run(
-      new CompileFunctionTask(isolate, &done_monitor, &done));
+      new CompileFunctionTask(isolate, func, &done_monitor, &done));
   {
     // Manually wait.
     // TODO(koda): Replace with execution of Dart and/or VM code when GC
     // actually safepoints everything.
     MonitorLocker ml(&done_monitor);
     while (!done) {
       ml.Wait();
     }
   }
 }
@@ skipping 107 matching lines @@
   EXPECT(val.IsInteger());
   EXPECT_EQ(7, Integer::Cast(val).AsInt64Value());
 
   intptr_t final_class_table_size =
       Isolate::Current()->class_table()->NumCids();
   // Eval should not eat into this non-renewable resource.
   EXPECT_EQ(initial_class_table_size, final_class_table_size);
 }
 
 }  // namespace dart