Fix mac debug build.

runtime/vm/compiler.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 "vm/compiler.h"
 
 #include "vm/assembler.h"
 #include "vm/ast_printer.h"
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 225 matching lines @@
       function.SetCode(code);
       ASSERT(CodePatcher::CodeIsPatchable(code));
     }
   }
 }
 
 
 static RawError* CompileFunctionHelper(const Function& function,
                                        bool optimized) {
   Isolate* isolate = Isolate::Current();
-  Error& error = Error::Handle();
   LongJump* base = isolate->long_jump_base();
   LongJump jump;
   isolate->set_long_jump_base(&jump);
   // Skips parsing if we need to only install unoptimized code.
   if (!optimized && !Code::Handle(function.unoptimized_code()).IsNull()) {
     InstallUnoptimizedCode(function);
     isolate->set_long_jump_base(base);
     return Error::null();
   }
   if (setjmp(*jump.Set()) == 0) {
@@ skipping 59 matching lines @@
         OS::Print("  var %s scope %ld (valid %d-%d) offset %ld\n",
                   var_name.ToCString(), scope_id, begin_pos, end_pos, slot);
       }
       OS::Print("}\n");
       OS::Print("Exception Handlers for function '%s' {\n", function_fullname);
       const ExceptionHandlers& handlers =
           ExceptionHandlers::Handle(code.exception_handlers());
       OS::Print("%s", handlers.ToCString());
       OS::Print("}\n");
     }
+    isolate->set_long_jump_base(base);
+    return Error::null();
   } else {
+    Error& error = Error::Handle();
     // We got an error during compilation.
     error = isolate->object_store()->sticky_error();
     isolate->object_store()->clear_sticky_error();
+    isolate->set_long_jump_base(base);
+    return error.raw();
   }
-  isolate->set_long_jump_base(base);
-  return error.raw();
+  UNREACHABLE();
+  return Error::null();
 }
 
 
 RawError* Compiler::CompileFunction(const Function& function) {
   return CompileFunctionHelper(function, false);  // Non-optimized.
 }
 
 
 RawError* Compiler::CompileOptimizedFunction(const Function& function) {
   return CompileFunctionHelper(function, true);  // Optimized.
 }
 
 
 RawError* Compiler::CompileParsedFunction(
     const ParsedFunction& parsed_function) {
   Isolate* isolate = Isolate::Current();
-  Error& error = Error::Handle();
   LongJump* base = isolate->long_jump_base();
   LongJump jump;
   isolate->set_long_jump_base(&jump);
   if (setjmp(*jump.Set()) == 0) {
     CompileParsedFunctionHelper(parsed_function, false);  // Non-optimized.
+    isolate->set_long_jump_base(base);
+    return Error::null();
   } else {
+    Error& error = Error::Handle();
     // We got an error during compilation.
     error = isolate->object_store()->sticky_error();
     isolate->object_store()->clear_sticky_error();
+    isolate->set_long_jump_base(base);
+    return error.raw();
   }
-  isolate->set_long_jump_base(base);
-  return error.raw();
+  UNREACHABLE();
+  return Error::null();
 }
 
 
 RawError* Compiler::CompileAllFunctions(const Class& cls) {
   Error& error = Error::Handle();
   Array& functions = Array::Handle(cls.functions());
   Function& func = Function::Handle();
   for (int i = 0; i < functions.Length(); i++) {
     func ^= functions.At(i);
     ASSERT(!func.IsNull());
     if (!func.HasCode() && !func.IsAbstract()) {
       error = CompileFunction(func);
       if (!error.IsNull()) {
         return error.raw();
       }
     }
   }
   return error.raw();
 }
 
 
 RawObject* Compiler::ExecuteOnce(SequenceNode* fragment) {
   Isolate* isolate = Isolate::Current();
-  Object& result = Object::Handle();
   LongJump* base = isolate->long_jump_base();
   LongJump jump;
   isolate->set_long_jump_base(&jump);
   if (setjmp(*jump.Set()) == 0) {
     if (FLAG_trace_compiler) {
       OS::Print("compiling expression: ");
       AstPrinter::PrintNode(fragment);
     }
 
     // Create a dummy function object for the code generator.
@@ skipping 18 matching lines @@
     // would compile func automatically. We are checking fewer invariants
     // here.
     ParsedFunction parsed_function(func);
     parsed_function.SetNodeSequence(fragment);
     parsed_function.set_default_parameter_values(Array::Handle());
 
     CompileParsedFunctionHelper(parsed_function, false);  // Non-optimized.
 
     GrowableArray<const Object*> arguments;  // no arguments.
     const Array& kNoArgumentNames = Array::Handle();
+    Object& result = Object::Handle();
     result = DartEntry::InvokeStatic(func,
                                      arguments,
                                      kNoArgumentNames);
+    isolate->set_long_jump_base(base);
+    return result.raw();
   } else {
+    Object& result = Object::Handle();
     result = isolate->object_store()->sticky_error();
     isolate->object_store()->clear_sticky_error();
+    isolate->set_long_jump_base(base);
+    return result.raw();
   }
-  isolate->set_long_jump_base(base);
-  return result.raw();
+  UNREACHABLE();
+  return Error::null();

[siva, 2012/05/05 00:11:15]

Object::null()

[regis, 2012/05/05 00:24:09]

Good point. I'll change it in my next cl.

 }
 
 
 }  // namespace dart