Work around two ASSERTs that we're hitting now that DEBUG is #defined again

R=danno@chromium.org

Review URL: https://codereview.chromium.org/49433002

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@17418 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

src/compiler.cc

@@ -665,6 +665,10 @@ static Handle<SharedFunctionInfo> MakeFunctionInfo(CompilationInfo* info) {
     }
   }
 
+  FunctionLiteral* lit = info->function();
+  LiveEditFunctionTracker live_edit_tracker(isolate, lit);
+  Handle<SharedFunctionInfo> result;
+  {
     // Measure how long it takes to do the compilation; only take the
     // rest of the function into account to avoid overlap with the
     // parsing statistics.
@@ -674,8 +678,6 @@ static Handle<SharedFunctionInfo> MakeFunctionInfo(CompilationInfo* info) {
     HistogramTimerScope timer(rate);
 
     // Compile the code.
-  FunctionLiteral* lit = info->function();
-  LiveEditFunctionTracker live_edit_tracker(isolate, lit);
     if (!MakeCode(info)) {
       if (!isolate->has_pending_exception()) isolate->StackOverflow();
       return Handle<SharedFunctionInfo>::null();
@@ -683,7 +685,7 @@ static Handle<SharedFunctionInfo> MakeFunctionInfo(CompilationInfo* info) {
 
     // Allocate function.
     ASSERT(!info->code().is_null());
-  Handle<SharedFunctionInfo> result =
+    result =
         isolate->factory()->NewSharedFunctionInfo(
             lit->name(),
             lit->materialized_literal_count(),
@@ -722,9 +724,11 @@ static Handle<SharedFunctionInfo> MakeFunctionInfo(CompilationInfo* info) {
     // Hint to the runtime system used when allocating space for initial
     // property space by setting the expected number of properties for
     // the instances of the function.
-  SetExpectedNofPropertiesFromEstimate(result, lit->expected_property_count());
+    SetExpectedNofPropertiesFromEstimate(result,
+                                         lit->expected_property_count());
 
     script->set_compilation_state(Script::COMPILATION_STATE_COMPILED);
+  }
 
 #ifdef ENABLE_DEBUGGER_SUPPORT
   // Notify debugger

src/objects-inl.h

@@ -1667,7 +1667,9 @@ int JSObject::GetHeaderSize() {
     case JS_MESSAGE_OBJECT_TYPE:
       return JSMessageObject::kSize;
     default:
-      UNREACHABLE();
+      // TODO(jkummerow): Re-enable this. Blink currently hits this
+      // from its CustomElementConstructorBuilder.
+      // UNREACHABLE();
       return 0;
   }
 }