Revision: 24556
Author: [email protected]
Date: Mon Oct 13 12:12:16 2014 UTC
Log: Version 3.29.88.6 (merged r24190)
X87: Refactor bailout reasons and disable optimization in more cases.
[email protected]
BUG=
Review URL: https://codereview.chromium.org/654553002
https://code.google.com/p/v8/source/detail?r=24556
Modified:
/branches/3.29/src/version.cc
/branches/3.29/src/x87/lithium-x87.cc
/branches/3.29/src/x87/lithium-x87.h
/branches/3.29/src/x87/macro-assembler-x87.h
=======================================
--- /branches/3.29/src/version.cc Fri Oct 10 09:43:48 2014 UTC
+++ /branches/3.29/src/version.cc Mon Oct 13 12:12:16 2014 UTC
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 3
#define MINOR_VERSION 29
#define BUILD_NUMBER 88
-#define PATCH_LEVEL 5
+#define PATCH_LEVEL 6
// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
#define IS_CANDIDATE_VERSION 0
=======================================
--- /branches/3.29/src/x87/lithium-x87.cc Wed Sep 24 00:05:07 2014 UTC
+++ /branches/3.29/src/x87/lithium-x87.cc Mon Oct 13 12:12:16 2014 UTC
@@ -470,12 +470,6 @@
status_ = DONE;
return chunk_;
}
-
-
-void LChunkBuilder::Abort(BailoutReason reason) {
- info()->set_bailout_reason(reason);
- status_ = ABORTED;
-}
LUnallocated* LChunkBuilder::ToUnallocated(Register reg) {
@@ -2534,7 +2528,7 @@
} else {
spill_index = env_index - instr->environment()->first_local_index();
if (spill_index > LUnallocated::kMaxFixedSlotIndex) {
- Abort(kNotEnoughSpillSlotsForOsr);
+ Retry(kNotEnoughSpillSlotsForOsr);
spill_index = 0;
}
if (spill_index == 0) {
=======================================
--- /branches/3.29/src/x87/lithium-x87.h Wed Sep 24 00:05:07 2014 UTC
+++ /branches/3.29/src/x87/lithium-x87.h Mon Oct 13 12:12:16 2014 UTC
@@ -2760,17 +2760,11 @@
class LChunkBuilder FINAL : public LChunkBuilderBase {
public:
LChunkBuilder(CompilationInfo* info, HGraph* graph, LAllocator*
allocator)
- : LChunkBuilderBase(graph->zone()),
- chunk_(NULL),
- info_(info),
- graph_(graph),
- status_(UNUSED),
+ : LChunkBuilderBase(info, graph),
current_instruction_(NULL),
current_block_(NULL),
next_block_(NULL),
- allocator_(allocator) { }
-
- Isolate* isolate() const { return graph_->isolate(); }
+ allocator_(allocator) {}
// Build the sequence for the graph.
LPlatformChunk* Build();
@@ -2800,24 +2794,6 @@
LInstruction* DoFlooringDivI(HMathFloorOfDiv* instr);
private:
- enum Status {
- UNUSED,
- BUILDING,
- DONE,
- ABORTED
- };
-
- LPlatformChunk* chunk() const { return chunk_; }
- CompilationInfo* info() const { return info_; }
- HGraph* graph() const { return graph_; }
-
- bool is_unused() const { return status_ == UNUSED; }
- bool is_building() const { return status_ == BUILDING; }
- bool is_done() const { return status_ == DONE; }
- bool is_aborted() const { return status_ == ABORTED; }
-
- void Abort(BailoutReason reason);
-
// Methods for getting operands for Use / Define / Temp.
LUnallocated* ToUnallocated(Register reg);
LUnallocated* ToUnallocated(X87Register reg);
@@ -2911,10 +2887,6 @@
LOperand* GetStoreKeyedValueOperand(HStoreKeyed* instr);
- LPlatformChunk* chunk_;
- CompilationInfo* info_;
- HGraph* const graph_;
- Status status_;
HInstruction* current_instruction_;
HBasicBlock* current_block_;
HBasicBlock* next_block_;
=======================================
--- /branches/3.29/src/x87/macro-assembler-x87.h Thu Sep 25 00:05:09 2014
UTC
+++ /branches/3.29/src/x87/macro-assembler-x87.h Mon Oct 13 12:12:16 2014
UTC
@@ -6,6 +6,7 @@
#define V8_X87_MACRO_ASSEMBLER_X87_H_
#include "src/assembler.h"
+#include "src/bailout-reason.h"
#include "src/frames.h"
#include "src/globals.h"
--
--
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.
