Reviewers: titzer,
Description:
Deprecate semi-correct CompilationInfo::flags predicate.
[email protected]
Please review this at https://codereview.chromium.org/1304053004/
Base URL: https://chromium.googlesource.com/v8/v8.git@master
Affected files (+13, -19 lines):
M src/codegen.h
M src/codegen.cc
M src/compiler.h
M src/compiler.cc
M src/compiler/code-generator.cc
M src/full-codegen/full-codegen.cc
M src/lithium.cc
Index: src/codegen.cc
diff --git a/src/codegen.cc b/src/codegen.cc
index
c9de2b1af16c666177617a5600ae30f5298a1a34..cc5495bc1b91612ca409d9eca06fd654ac3d3e17
100644
--- a/src/codegen.cc
+++ b/src/codegen.cc
@@ -149,10 +149,18 @@ void CodeGenerator::MakeCodePrologue(CompilationInfo*
info, const char* kind) {
Handle<Code> CodeGenerator::MakeCodeEpilogue(MacroAssembler* masm,
- Code::Flags flags,
CompilationInfo* info) {
Isolate* isolate = info->isolate();
+ Code::Flags flags =
+ info->code_stub() != nullptr
+ ? Code::ComputeFlags(info->code_stub()->GetCodeKind(),
+ info->code_stub()->GetICState(),
+ info->code_stub()->GetExtraICState(),
+ info->code_stub()->GetStubType())
+ : Code::ComputeFlags(info->IsOptimizing() ?
Code::OPTIMIZED_FUNCTION
+ : Code::FUNCTION);
+
// Allocate and install the code.
CodeDesc desc;
bool is_crankshafted =
Index: src/codegen.h
diff --git a/src/codegen.h b/src/codegen.h
index
9025a9fca6bc8b7616574345b4ca11bfef20c193..04f130999eec309cbdcd5aa539c5f33c67b7c9c8
100644
--- a/src/codegen.h
+++ b/src/codegen.h
@@ -76,7 +76,6 @@ class CodeGenerator {
// Allocate and install the code.
static Handle<Code> MakeCodeEpilogue(MacroAssembler* masm,
- Code::Flags flags,
CompilationInfo* info);
// Print the code after compiling it.
Index: src/compiler.cc
diff --git a/src/compiler.cc b/src/compiler.cc
index
76c70acd300cf783be181663ea67b629bec32233..9ce666c911a3edb95498371c81fee474ed993121
100644
--- a/src/compiler.cc
+++ b/src/compiler.cc
@@ -215,15 +215,6 @@ int CompilationInfo::num_heap_slots() const {
}
-Code::Flags CompilationInfo::flags() const {
- return code_stub() != nullptr
- ? Code::ComputeFlags(
- code_stub()->GetCodeKind(), code_stub()->GetICState(),
- code_stub()->GetExtraICState(),
code_stub()->GetStubType())
- : Code::ComputeFlags(Code::OPTIMIZED_FUNCTION);
-}
-
-
// Primitive functions are unlikely to be picked up by the stack-walking
// profiler, so they trigger their own optimization when they're called
// for the SharedFunctionInfo::kCallsUntilPrimitiveOptimization-th time.
Index: src/compiler.h
diff --git a/src/compiler.h b/src/compiler.h
index
47751113628c1b0a2b4176e32aa79cdea664e5e8..ea311cccfb0d4d96d0550a4216f38cd14401d4bd
100644
--- a/src/compiler.h
+++ b/src/compiler.h
@@ -173,7 +173,6 @@ class CompilationInfo {
int num_parameters_including_this() const;
bool is_this_defined() const;
int num_heap_slots() const;
- Code::Flags flags() const;
void set_parameter_count(int parameter_count) {
DCHECK(IsStub());
Index: src/compiler/code-generator.cc
diff --git a/src/compiler/code-generator.cc b/src/compiler/code-generator.cc
index
07a741f73e24f2595ee5777ca8df5d8d8afc36aa..26683859b0510089b42d70f14f68fa38c8195d24
100644
--- a/src/compiler/code-generator.cc
+++ b/src/compiler/code-generator.cc
@@ -167,8 +167,8 @@ Handle<Code> CodeGenerator::GenerateCode() {
safepoints()->Emit(masm(), frame()->GetSpillSlotCount());
- Handle<Code> result = v8::internal::CodeGenerator::MakeCodeEpilogue(
- masm(), info->flags(), info);
+ Handle<Code> result =
+ v8::internal::CodeGenerator::MakeCodeEpilogue(masm(), info);
result->set_is_turbofanned(true);
result->set_stack_slots(frame()->GetSpillSlotCount());
result->set_safepoint_table_offset(safepoints()->GetCodeOffset());
Index: src/full-codegen/full-codegen.cc
diff --git a/src/full-codegen/full-codegen.cc
b/src/full-codegen/full-codegen.cc
index
5b8d9c559cf11f92603424e351c0ae58ff42a24a..1017b3185ba11845436f9213b97b98e770544cbc
100644
--- a/src/full-codegen/full-codegen.cc
+++ b/src/full-codegen/full-codegen.cc
@@ -50,8 +50,7 @@ bool FullCodeGenerator::MakeCode(CompilationInfo* info) {
}
unsigned table_offset = cgen.EmitBackEdgeTable();
- Code::Flags flags = Code::ComputeFlags(Code::FUNCTION);
- Handle<Code> code = CodeGenerator::MakeCodeEpilogue(&masm, flags, info);
+ Handle<Code> code = CodeGenerator::MakeCodeEpilogue(&masm, info);
cgen.PopulateDeoptimizationData(code);
cgen.PopulateTypeFeedbackInfo(code);
cgen.PopulateHandlerTable(code);
Index: src/lithium.cc
diff --git a/src/lithium.cc b/src/lithium.cc
index
728ed67fb5b22c145a00eedda98f05c2032b8150..7d37532ace71140d61bf42f20937aac91ac3088d
100644
--- a/src/lithium.cc
+++ b/src/lithium.cc
@@ -520,9 +520,7 @@ Handle<Code> LChunk::Codegen() {
if (generator.GenerateCode()) {
generator.CheckEnvironmentUsage();
CodeGenerator::MakeCodePrologue(info(), "optimized");
- Code::Flags flags = info()->flags();
- Handle<Code> code =
- CodeGenerator::MakeCodeEpilogue(&assembler, flags, info());
+ Handle<Code> code = CodeGenerator::MakeCodeEpilogue(&assembler,
info());
generator.FinishCode(code);
CommitDependencies(code);
code->set_is_crankshafted(true);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
