From 381e66716ad3a72661748f0d51f0983da03251cb Mon Sep 17 00:00:00 2001 From: Georg Neis Date: Fri, 30 Jun 2017 14:45:55 +0200 Subject: [PATCH] [macro-assembler] Remove unused predicate generating_stub(). R=jarin@chromium.org,bmeurer@chromium.org Bug: Change-Id: I6f4e56f37987d2ae67eed91401b10dcc26397970 Reviewed-on: https://chromium-review.googlesource.com/558086 Reviewed-by: Jaroslav Sevcik Commit-Queue: Georg Neis Cr-Commit-Position: refs/heads/master@{#46404} --- src/arm/macro-assembler-arm.cc | 1 - src/arm/macro-assembler-arm.h | 4 ---- src/arm64/macro-assembler-arm64.cc | 1 - src/arm64/macro-assembler-arm64.h | 3 --- src/code-stubs.cc | 1 - src/ia32/macro-assembler-ia32.cc | 1 - src/ia32/macro-assembler-ia32.h | 4 ---- src/mips/macro-assembler-mips.cc | 1 - src/mips/macro-assembler-mips.h | 4 ---- src/mips64/macro-assembler-mips64.cc | 1 - src/mips64/macro-assembler-mips64.h | 4 ---- src/ppc/macro-assembler-ppc.cc | 1 - src/ppc/macro-assembler-ppc.h | 4 ---- src/s390/macro-assembler-s390.cc | 1 - src/s390/macro-assembler-s390.h | 4 ---- src/x64/macro-assembler-x64.cc | 1 - src/x64/macro-assembler-x64.h | 4 ---- 17 files changed, 40 deletions(-) diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc index afe1a83e2f..a63016fe1f 100644 --- a/src/arm/macro-assembler-arm.cc +++ b/src/arm/macro-assembler-arm.cc @@ -26,7 +26,6 @@ namespace internal { MacroAssembler::MacroAssembler(Isolate* isolate, void* buffer, int size, CodeObjectRequired create_code_object) : Assembler(isolate, buffer, size), - generating_stub_(false), has_frame_(false), isolate_(isolate), jit_cookie_(0) { diff --git a/src/arm/macro-assembler-arm.h b/src/arm/macro-assembler-arm.h index b528547a5f..4d8532e492 100644 --- a/src/arm/macro-assembler-arm.h +++ b/src/arm/macro-assembler-arm.h @@ -1120,9 +1120,6 @@ class MacroAssembler: public Assembler { // Print a message to stdout and abort execution. void Abort(BailoutReason msg); - // Verify restrictions about code generated in stubs. - void set_generating_stub(bool value) { generating_stub_ = value; } - bool generating_stub() { return generating_stub_; } void set_has_frame(bool value) { has_frame_ = value; } bool has_frame() { return has_frame_; } inline bool AllowThisStubCall(CodeStub* stub); @@ -1367,7 +1364,6 @@ class MacroAssembler: public Assembler { template void FloatMinOutOfLineHelper(T result, T left, T right); - bool generating_stub_; bool has_frame_; Isolate* isolate_; // This handle will be patched with the code object on installation. diff --git a/src/arm64/macro-assembler-arm64.cc b/src/arm64/macro-assembler-arm64.cc index 8354f99595..3e955f8957 100644 --- a/src/arm64/macro-assembler-arm64.cc +++ b/src/arm64/macro-assembler-arm64.cc @@ -28,7 +28,6 @@ MacroAssembler::MacroAssembler(Isolate* isolate, byte* buffer, unsigned buffer_size, CodeObjectRequired create_code_object) : Assembler(isolate, buffer, buffer_size), - generating_stub_(false), #if DEBUG allow_macro_instructions_(true), #endif diff --git a/src/arm64/macro-assembler-arm64.h b/src/arm64/macro-assembler-arm64.h index cf87dd53f0..bebb5298eb 100644 --- a/src/arm64/macro-assembler-arm64.h +++ b/src/arm64/macro-assembler-arm64.h @@ -1838,8 +1838,6 @@ class MacroAssembler : public Assembler { // ---- Code generation helpers ---- - void set_generating_stub(bool value) { generating_stub_ = value; } - bool generating_stub() const { return generating_stub_; } #if DEBUG void set_allow_macro_instructions(bool value) { allow_macro_instructions_ = value; @@ -2504,7 +2502,6 @@ class MacroAssembler : public Assembler { Label* on_successful_conversion = NULL, Label* on_failed_conversion = NULL); - bool generating_stub_; #if DEBUG // Tell whether any of the macro instruction can be used. When false the // MacroAssembler will assert if a method which can emit a variable number diff --git a/src/code-stubs.cc b/src/code-stubs.cc index a0ab450e26..d6e26204ac 100644 --- a/src/code-stubs.cc +++ b/src/code-stubs.cc @@ -137,7 +137,6 @@ Handle PlatformCodeStub::GenerateCode() { isolate()->counters()->code_stubs()->Increment(); // Generate the code for the stub. - masm.set_generating_stub(true); // TODO(yangguo): remove this once we can serialize IC stubs. masm.enable_serializer(); NoCurrentFrameScope scope(&masm); diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc index c78a79c0f9..afea53a61b 100644 --- a/src/ia32/macro-assembler-ia32.cc +++ b/src/ia32/macro-assembler-ia32.cc @@ -24,7 +24,6 @@ namespace internal { MacroAssembler::MacroAssembler(Isolate* isolate, void* buffer, int size, CodeObjectRequired create_code_object) : Assembler(isolate, buffer, size), - generating_stub_(false), has_frame_(false), isolate_(isolate), jit_cookie_(0) { diff --git a/src/ia32/macro-assembler-ia32.h b/src/ia32/macro-assembler-ia32.h index 17a5452bfb..927b34ab4f 100644 --- a/src/ia32/macro-assembler-ia32.h +++ b/src/ia32/macro-assembler-ia32.h @@ -812,9 +812,6 @@ class MacroAssembler: public Assembler { // Check that the stack is aligned. void CheckStackAlignment(); - // Verify restrictions about code generated in stubs. - void set_generating_stub(bool value) { generating_stub_ = value; } - bool generating_stub() { return generating_stub_; } void set_has_frame(bool value) { has_frame_ = value; } bool has_frame() { return has_frame_; } inline bool AllowThisStubCall(CodeStub* stub); @@ -870,7 +867,6 @@ class MacroAssembler: public Assembler { Label* no_memento_found); private: - bool generating_stub_; bool has_frame_; Isolate* isolate_; // This handle will be patched with the code object on installation. diff --git a/src/mips/macro-assembler-mips.cc b/src/mips/macro-assembler-mips.cc index 4c91633a68..f3c5669d54 100644 --- a/src/mips/macro-assembler-mips.cc +++ b/src/mips/macro-assembler-mips.cc @@ -21,7 +21,6 @@ namespace internal { MacroAssembler::MacroAssembler(Isolate* isolate, void* buffer, int size, CodeObjectRequired create_code_object) : Assembler(isolate, buffer, size), - generating_stub_(false), has_frame_(false), has_double_zero_reg_set_(false), isolate_(isolate) { diff --git a/src/mips/macro-assembler-mips.h b/src/mips/macro-assembler-mips.h index 94a7c55422..e008a80a12 100644 --- a/src/mips/macro-assembler-mips.h +++ b/src/mips/macro-assembler-mips.h @@ -1428,9 +1428,6 @@ const Operand& rt = Operand(zero_reg), BranchDelaySlot bd = PROTECT // Print a message to stdout and abort execution. void Abort(BailoutReason msg); - // Verify restrictions about code generated in stubs. - void set_generating_stub(bool value) { generating_stub_ = value; } - bool generating_stub() { return generating_stub_; } void set_has_frame(bool value) { has_frame_ = value; } bool has_frame() { return has_frame_; } inline bool AllowThisStubCall(CodeStub* stub); @@ -1728,7 +1725,6 @@ const Operand& rt = Operand(zero_reg), BranchDelaySlot bd = PROTECT MemOperand SafepointRegisterSlot(Register reg); MemOperand SafepointRegistersAndDoublesSlot(Register reg); - bool generating_stub_; bool has_frame_; bool has_double_zero_reg_set_; Isolate* isolate_; diff --git a/src/mips64/macro-assembler-mips64.cc b/src/mips64/macro-assembler-mips64.cc index ed732b37ca..8c20dfb019 100644 --- a/src/mips64/macro-assembler-mips64.cc +++ b/src/mips64/macro-assembler-mips64.cc @@ -32,7 +32,6 @@ const uint32_t kSingleNaNMask = kSingleExponentMask | (1 << kSingleNaNShift); MacroAssembler::MacroAssembler(Isolate* isolate, void* buffer, int size, CodeObjectRequired create_code_object) : Assembler(isolate, buffer, size), - generating_stub_(false), has_frame_(false), has_double_zero_reg_set_(false), isolate_(isolate) { diff --git a/src/mips64/macro-assembler-mips64.h b/src/mips64/macro-assembler-mips64.h index 2a552f6d09..6d69bfe7c5 100644 --- a/src/mips64/macro-assembler-mips64.h +++ b/src/mips64/macro-assembler-mips64.h @@ -1547,9 +1547,6 @@ const Operand& rt = Operand(zero_reg), BranchDelaySlot bd = PROTECT // Print a message to stdout and abort execution. void Abort(BailoutReason msg); - // Verify restrictions about code generated in stubs. - void set_generating_stub(bool value) { generating_stub_ = value; } - bool generating_stub() { return generating_stub_; } void set_has_frame(bool value) { has_frame_ = value; } bool has_frame() { return has_frame_; } inline bool AllowThisStubCall(CodeStub* stub); @@ -1880,7 +1877,6 @@ const Operand& rt = Operand(zero_reg), BranchDelaySlot bd = PROTECT void LoadRegPlusOffsetToAt(const MemOperand& src); int32_t LoadRegPlusUpperOffsetPartToAt(const MemOperand& src); - bool generating_stub_; bool has_frame_; bool has_double_zero_reg_set_; Isolate* isolate_; diff --git a/src/ppc/macro-assembler-ppc.cc b/src/ppc/macro-assembler-ppc.cc index fa49c0ae05..0a0354bfb5 100644 --- a/src/ppc/macro-assembler-ppc.cc +++ b/src/ppc/macro-assembler-ppc.cc @@ -23,7 +23,6 @@ namespace internal { MacroAssembler::MacroAssembler(Isolate* isolate, void* buffer, int size, CodeObjectRequired create_code_object) : Assembler(isolate, buffer, size), - generating_stub_(false), has_frame_(false), isolate_(isolate) { if (create_code_object == CodeObjectRequired::kYes) { diff --git a/src/ppc/macro-assembler-ppc.h b/src/ppc/macro-assembler-ppc.h index 9c21275096..58dfbc25f2 100644 --- a/src/ppc/macro-assembler-ppc.h +++ b/src/ppc/macro-assembler-ppc.h @@ -1017,9 +1017,6 @@ class MacroAssembler : public Assembler { // Print a message to stdout and abort execution. void Abort(BailoutReason reason); - // Verify restrictions about code generated in stubs. - void set_generating_stub(bool value) { generating_stub_ = value; } - bool generating_stub() { return generating_stub_; } void set_has_frame(bool value) { has_frame_ = value; } bool has_frame() { return has_frame_; } inline bool AllowThisStubCall(CodeStub* stub); @@ -1479,7 +1476,6 @@ class MacroAssembler : public Assembler { MemOperand SafepointRegisterSlot(Register reg); MemOperand SafepointRegistersAndDoublesSlot(Register reg); - bool generating_stub_; bool has_frame_; Isolate* isolate_; // This handle will be patched with the code object on installation. diff --git a/src/s390/macro-assembler-s390.cc b/src/s390/macro-assembler-s390.cc index 276c32906b..21e75ae9aa 100644 --- a/src/s390/macro-assembler-s390.cc +++ b/src/s390/macro-assembler-s390.cc @@ -23,7 +23,6 @@ namespace internal { MacroAssembler::MacroAssembler(Isolate* isolate, void* buffer, int size, CodeObjectRequired create_code_object) : Assembler(isolate, buffer, size), - generating_stub_(false), has_frame_(false), isolate_(isolate) { if (create_code_object == CodeObjectRequired::kYes) { diff --git a/src/s390/macro-assembler-s390.h b/src/s390/macro-assembler-s390.h index 0493099049..36b5599456 100644 --- a/src/s390/macro-assembler-s390.h +++ b/src/s390/macro-assembler-s390.h @@ -1314,9 +1314,6 @@ class MacroAssembler : public Assembler { // Print a message to stdout and abort execution. void Abort(BailoutReason reason); - // Verify restrictions about code generated in stubs. - void set_generating_stub(bool value) { generating_stub_ = value; } - bool generating_stub() { return generating_stub_; } void set_has_frame(bool value) { has_frame_ = value; } bool has_frame() { return has_frame_; } inline bool AllowThisStubCall(CodeStub* stub); @@ -1767,7 +1764,6 @@ class MacroAssembler : public Assembler { MemOperand SafepointRegisterSlot(Register reg); MemOperand SafepointRegistersAndDoublesSlot(Register reg); - bool generating_stub_; bool has_frame_; Isolate* isolate_; // This handle will be patched with the code object on installation. diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc index 6b40e9ee76..ae3fda6e92 100644 --- a/src/x64/macro-assembler-x64.cc +++ b/src/x64/macro-assembler-x64.cc @@ -24,7 +24,6 @@ namespace internal { MacroAssembler::MacroAssembler(Isolate* isolate, void* buffer, int size, CodeObjectRequired create_code_object) : Assembler(isolate, buffer, size), - generating_stub_(false), has_frame_(false), isolate_(isolate), root_array_available_(true), diff --git a/src/x64/macro-assembler-x64.h b/src/x64/macro-assembler-x64.h index 2864ba5175..30ced4c99b 100644 --- a/src/x64/macro-assembler-x64.h +++ b/src/x64/macro-assembler-x64.h @@ -1376,9 +1376,6 @@ class MacroAssembler: public Assembler { // Check that the stack is aligned. void CheckStackAlignment(); - // Verify restrictions about code generated in stubs. - void set_generating_stub(bool value) { generating_stub_ = value; } - bool generating_stub() { return generating_stub_; } void set_has_frame(bool value) { has_frame_ = value; } bool has_frame() { return has_frame_; } inline bool AllowThisStubCall(CodeStub* stub); @@ -1419,7 +1416,6 @@ class MacroAssembler: public Assembler { static const int kNumSafepointSavedRegisters = 12; static const int kSmiShift = kSmiTagSize + kSmiShiftSize; - bool generating_stub_; bool has_frame_; Isolate* isolate_; bool root_array_available_;