[Isolates] Merge crankshaft (r5922 from bleeding_edge).

test/cctest/test-profile-generator.cc

 // Copyright 2010 the V8 project authors. All rights reserved.
 //
 // Tests of profiles generator and utilities.
 
 #ifdef ENABLE_LOGGING_AND_PROFILING
 
 #include "v8.h"
 #include "profile-generator-inl.h"
 #include "cctest.h"
 #include "../include/v8-profiler.h"
@@ skipping 739 matching lines @@
                                     const char* name) {
   for (int i = 0; i < parent->children()->length(); ++i) {
     const ProfileNode* child = parent->children()->at(i);
     if (strcmp(child->entry()->name(), name) == 0) return child;
   }
   return NULL;
 }
 
 
 TEST(RecordStackTraceAtStartProfiling) {
+  // This test does not pass with inlining enabled since inlined functions
+  // don't appear in the stack trace.
+  i::FLAG_use_inlining = false;
+
   if (env.IsEmpty()) {
     v8::HandleScope scope;
     const char* extensions[] = { "v8/profiler" };
     v8::ExtensionConfiguration config(1, extensions);
     env = v8::Context::New(&config);
   }
   v8::HandleScope scope;
   env->Enter();
 
   CHECK_EQ(0, CpuProfiler::GetProfilesCount());
@@ skipping 36 matching lines @@
     CHECK(collection.StartProfiling(title.start(), i + 1));  // UID must be > 0.
     titles[i] = title.start();
   }
   CHECK(!collection.StartProfiling(
       "maximum", CpuProfilesCollection::kMaxSimultaneousProfiles + 1));
   for (int i = 0; i < CpuProfilesCollection::kMaxSimultaneousProfiles; ++i)
     i::DeleteArray(titles[i]);
 }
 
 #endif  // ENABLE_LOGGING_AND_PROFILING