Fix a bug where if a non-lazily-compiled function is a candidate for...

src/compiler.cc

 // Copyright 2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 485 matching lines @@
   if (FLAG_lazy && allow_lazy) {
     code = ComputeLazyCompile(literal->num_parameters());
   } else {
     // The bodies of function literals have not yet been visited by
     // the AST optimizer/analyzer.
     if (!Rewriter::Optimize(literal)) {
       return Handle<JSFunction>::null();
     }
 
     // Generate code and return it.
+    bool is_compiled = false;
     if (FLAG_fast_compiler && literal->try_fast_codegen()) {
       CodeGenSelector selector;
       CodeGenSelector::CodeGenTag code_gen = selector.Select(literal);
       if (code_gen == CodeGenSelector::FAST) {
         code = FastCodeGenerator::MakeCode(literal,
                                            script,
                                            false);  // Not eval.
+        is_compiled = true;
       }
-      ASSERT(code_gen == CodeGenSelector::NORMAL);
-    } else {
+    }
+
+    if (!is_compiled) {
+      // We didn't try the fast compiler, or we failed to select it.
       code = CodeGenerator::MakeCode(literal,
                                      script,
                                      false);  // Not eval.
     }
 
     // Check for stack-overflow exception.
     if (code.is_null()) {
       caller->SetStackOverflow();
       return Handle<JSFunction>::null();
     }
@@ skipping 555 matching lines @@
 
 void CodeGenSelector::VisitThisFunction(ThisFunction* expr) {
   BAILOUT("ThisFunction");
 }
 
 #undef BAILOUT
 #undef CHECK_BAILOUT
 
 
 } }  // namespace v8::internal