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

R=mstarzinger@chromium.org
BUG=

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

Cr-Commit-Position: refs/heads/master@{#30892}

src/codegen.cc

@@ -144,16 +144,15 @@ 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;

src/compiler.cc

@@ -154,7 +154,9 @@ CompilationInfo::CompilationInfo(CodeStub* stub, Isolate* isolate, Zone* zone)
 
 CompilationInfo::CompilationInfo(const char* debug_name, Isolate* isolate,
                                  Zone* zone)
-    : CompilationInfo(nullptr, nullptr, debug_name, STUB, isolate, zone) {}
+    : CompilationInfo(nullptr, nullptr, debug_name, STUB, isolate, zone) {
+  set_output_code_kind(Code::STUB);
+}
 
 CompilationInfo::CompilationInfo(ParseInfo* parse_info, CodeStub* code_stub,
                                  const char* debug_name, Mode mode,
@@ -188,6 +190,9 @@ CompilationInfo::CompilationInfo(ParseInfo* parse_info, CodeStub* code_stub,
     if (descriptor.function_mode() == NOT_JS_FUNCTION_STUB_MODE) {
       parameter_count_--;
     }
+    set_output_code_kind(code_stub->GetCodeKind());
+  } else {
+    set_output_code_kind(Code::FUNCTION);
   }
 }
 
@@ -208,6 +213,7 @@ void CompilationInfo::SetStub(CodeStub* code_stub) {
   SetMode(STUB);
   code_stub_ = code_stub;
   debug_name_ = CodeStub::MajorName(code_stub->MajorKey());
+  set_output_code_kind(code_stub->GetCodeKind());
 }
 
 

src/compiler.h

@@ -299,6 +299,7 @@ class CompilationInfo {
     osr_ast_id_ = osr_ast_id;
     unoptimized_code_ = unoptimized;
     optimization_id_ = isolate()->NextOptimizationId();
+    set_output_code_kind(Code::OPTIMIZED_FUNCTION);
   }
 
   void SetFunctionType(Type::FunctionType* function_type) {
@@ -412,6 +413,10 @@ class CompilationInfo {
 
   base::SmartArrayPointer<char> GetDebugName() const;
 
+  Code::Kind output_code_kind() const { return output_code_kind_; }
+
+  void set_output_code_kind(Code::Kind kind) { output_code_kind_ = kind; }
+
  protected:
   ParseInfo* parse_info_;
 
@@ -451,6 +456,8 @@ class CompilationInfo {
 
   unsigned flags_;
 
+  Code::Kind output_code_kind_;
+
   // For compiled stubs, the stub object
   CodeStub* code_stub_;
   // The compiled code.