Add CompilationInfo::output_code_kind to allow overriding the kind of code generated.

src/codegen.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/codegen.h"
 
 #if defined(V8_OS_AIX)
 #include <fenv.h>  // NOLINT(build/c++11)
 #endif
 #include "src/bootstrapper.h"
@@ skipping 126 matching lines @@
                                     .PrintProgram(info->literal()));
   }
 #endif  // DEBUG
 }
 
 
 Handle<Code> CodeGenerator::MakeCodeEpilogue(MacroAssembler* masm,
                                              CompilationInfo* info) {
   Isolate* isolate = info->isolate();
 
-  Code::Flags flags =
-      info->IsStub()
-          ? info->code_stub()
-                ? Code::ComputeFlags(info->code_stub()->GetCodeKind(),
-                                     info->code_stub()->GetICState(),
-                                     info->code_stub()->GetExtraICState(),
-                                     info->code_stub()->GetStubType())
-                : Code::ComputeFlags(Code::STUB)
-          : Code::ComputeFlags(info->IsOptimizing() ? Code::OPTIMIZED_FUNCTION
-                                                    : Code::FUNCTION);
+  Code::Flags flags;
+  if (info->IsStub() && info->code_stub()) {
+    DCHECK_EQ(info->output_code_kind(), info->code_stub()->GetCodeKind());
+    flags = Code::ComputeFlags(
+        info->output_code_kind(), info->code_stub()->GetICState(),
+        info->code_stub()->GetExtraICState(), info->code_stub()->GetStubType());
+  } else {
+    flags = Code::ComputeFlags(info->output_code_kind());
+  }
 
   // Allocate and install the code.
   CodeDesc desc;
   bool is_crankshafted =
       Code::ExtractKindFromFlags(flags) == Code::OPTIMIZED_FUNCTION ||
       info->IsStub();
   masm->GetCode(&desc);
   Handle<Code> code =
       isolate->factory()->NewCode(desc, flags, masm->CodeObject(),
                                   false, is_crankshafted,
@@ skipping 58 matching lines @@
       os << "source_position = " << literal->start_position() << "\n";
     }
     code->Disassemble(debug_name.get(), os);
     os << "--- End code ---\n";
   }
 #endif  // ENABLE_DISASSEMBLER
 }
 
 }  // namespace internal
 }  // namespace v8