[Isolates] Merge 6700:7030 from bleeding_edge to isolates.

test/cctest/test-log.cc

 // Copyright 2006-2009 the V8 project authors. All rights reserved.
 //
 // Tests of logging functions from log.h
 
 #ifdef ENABLE_LOGGING_AND_PROFILING
 
 #ifdef __linux__
 #include <math.h>
 #include <pthread.h>
 #include <signal.h>
@@ skipping 1041 matching lines @@
   int ref_len = StrChrLen(ref_s, ',');
   int new_len = StrChrLen(new_s, ',');
   return ref_len == new_len && strncmp(ref_s, new_s, ref_len) == 0;
 }
 
 
 static bool AreFuncNamesEqual(CodeEntityInfo ref_s, CodeEntityInfo new_s) {
   // Skip size.
   ref_s = strchr(ref_s, ',') + 1;
   new_s = strchr(new_s, ',') + 1;
-  int ref_len = StrChrLen(ref_s, '\n');
-  int new_len = StrChrLen(new_s, '\n');
-  // If reference is anonymous (""), it's OK to have anything in new.
-  if (ref_len == 2) return true;
+  CHECK_EQ('"', ref_s[0]);
+  CHECK_EQ('"', new_s[0]);
+  int ref_len = StrChrLen(ref_s + 1, '\"');
+  int new_len = StrChrLen(new_s + 1, '\"');
   // A special case for ErrorPrototype. Haven't yet figured out why they
   // are different.
   const char* error_prototype = "\"ErrorPrototype";
   if (IsStringEqualTo(error_prototype, ref_s)
       && IsStringEqualTo(error_prototype, new_s)) {
     return true;
   }
   // Built-in objects have problems too.
   const char* built_ins[] = {
       "\"Boolean\"", "\"Function\"", "\"Number\"",
       "\"Object\"", "\"Script\"", "\"String\""
   };
   for (size_t i = 0; i < sizeof(built_ins) / sizeof(*built_ins); ++i) {
     if (IsStringEqualTo(built_ins[i], new_s)) {
       return true;
     }
   }
-  // Code objects can change their optimizability: code object may start
-  // as optimizable, but later be discovered to be actually not optimizable.
-  // Alas, we don't record this info as of now, so we allow cases when
-  // ref is thought to be optimizable while traverse finds it to be
-  // not optimizable.
-  if (ref_s[1] == '~') {  // Code object used to be optimizable
-    if (new_s[1] == ' ') {  // ...but later was set unoptimizable.
-      CHECK_EQ('"', ref_s[0]);
-      CHECK_EQ('"', new_s[0]);
-      ref_s += 2;  // Cut the leading quote and the marker
-      ref_len -= 2;
-      new_s += 1;  // Cut the leading quote only.
-      new_len -= 1;
-    }
-  }
   return ref_len == new_len && strncmp(ref_s, new_s, ref_len) == 0;
 }
 
 
 static bool AreEntitiesEqual(CodeEntityInfo ref_e, CodeEntityInfo new_e) {
   if (ref_e == NULL && new_e != NULL) return true;
   if (ref_e != NULL && new_e != NULL) {
     return AreFuncSizesEqual(ref_e, new_e) && AreFuncNamesEqual(ref_e, new_e);
   }
   if (ref_e != NULL && new_e == NULL) {
@@ skipping 95 matching lines @@
   // Make sure that all log data is written prior crash due to CHECK failure.
   fflush(stdout);
   CHECK(results_equal);
 
   env->Exit();
   LOGGER->TearDown();
   i::FLAG_always_compact = saved_always_compact;
 }
 
 #endif  // ENABLE_LOGGING_AND_PROFILING