Merge V8 5.3.332.45. DO NOT MERGE
Test: Manual
FPIIM-449
Change-Id: Id3254828b068abdea3cb10442e0172a8c9a98e03
(cherry picked from commit 13e2dadd00298019ed862f2b2fc5068bba730bcf)
diff --git a/src/interpreter/bytecode-array-builder.h b/src/interpreter/bytecode-array-builder.h
index 3930a06..8a10973 100644
--- a/src/interpreter/bytecode-array-builder.h
+++ b/src/interpreter/bytecode-array-builder.h
@@ -11,7 +11,6 @@
#include "src/interpreter/bytecodes.h"
#include "src/interpreter/constant-array-builder.h"
#include "src/interpreter/handler-table-builder.h"
-#include "src/interpreter/source-position-table.h"
#include "src/zone-containers.h"
namespace v8 {
@@ -86,8 +85,7 @@
BytecodeArrayBuilder& LoadFalse();
// Global loads to the accumulator and stores from the accumulator.
- BytecodeArrayBuilder& LoadGlobal(const Handle<String> name, int feedback_slot,
- TypeofMode typeof_mode);
+ BytecodeArrayBuilder& LoadGlobal(int feedback_slot, TypeofMode typeof_mode);
BytecodeArrayBuilder& StoreGlobal(const Handle<String> name,
int feedback_slot,
LanguageMode language_mode);
@@ -273,11 +271,23 @@
void EnsureReturn();
- static uint32_t RegisterOperand(Register reg);
- static Register RegisterFromOperand(uint32_t operand);
- static uint32_t SignedOperand(int value, OperandSize size);
- static uint32_t UnsignedOperand(int value);
- static uint32_t UnsignedOperand(size_t value);
+ static uint32_t RegisterOperand(Register reg) {
+ return static_cast<uint32_t>(reg.ToOperand());
+ }
+
+ static uint32_t SignedOperand(int value) {
+ return static_cast<uint32_t>(value);
+ }
+
+ static uint32_t UnsignedOperand(int value) {
+ DCHECK_GE(value, 0);
+ return static_cast<uint32_t>(value);
+ }
+
+ static uint32_t UnsignedOperand(size_t value) {
+ DCHECK_LE(value, kMaxUInt32);
+ return static_cast<uint32_t>(value);
+ }
private:
friend class BytecodeRegisterAllocator;
@@ -285,8 +295,8 @@
static Bytecode BytecodeForBinaryOperation(Token::Value op);
static Bytecode BytecodeForCountOperation(Token::Value op);
static Bytecode BytecodeForCompareOperation(Token::Value op);
- static Bytecode BytecodeForStoreIC(LanguageMode language_mode);
- static Bytecode BytecodeForKeyedStoreIC(LanguageMode language_mode);
+ static Bytecode BytecodeForStoreNamedProperty(LanguageMode language_mode);
+ static Bytecode BytecodeForStoreKeyedProperty(LanguageMode language_mode);
static Bytecode BytecodeForLoadGlobal(TypeofMode typeof_mode);
static Bytecode BytecodeForStoreGlobal(LanguageMode language_mode);
static Bytecode BytecodeForStoreLookupSlot(LanguageMode language_mode);
@@ -294,34 +304,21 @@
static Bytecode BytecodeForDelete(LanguageMode language_mode);
static Bytecode BytecodeForCall(TailCallMode tail_call_mode);
- static Bytecode GetJumpWithConstantOperand(Bytecode jump_smi8_operand);
-
+ void Output(Bytecode bytecode, uint32_t operand0, uint32_t operand1,
+ uint32_t operand2, uint32_t operand3);
+ void Output(Bytecode bytecode, uint32_t operand0, uint32_t operand1,
+ uint32_t operand2);
+ void Output(Bytecode bytecode, uint32_t operand0, uint32_t operand1);
+ void Output(Bytecode bytecode, uint32_t operand0);
void Output(Bytecode bytecode);
- void OutputScaled(Bytecode bytecode, OperandScale operand_scale,
- uint32_t operand0, uint32_t operand1, uint32_t operand2,
- uint32_t operand3);
- void OutputScaled(Bytecode bytecode, OperandScale operand_scale,
- uint32_t operand0, uint32_t operand1, uint32_t operand2);
- void OutputScaled(Bytecode bytecode, OperandScale operand_scale,
- uint32_t operand0, uint32_t operand1);
- void OutputScaled(Bytecode bytecode, OperandScale operand_scale,
- uint32_t operand0);
BytecodeArrayBuilder& OutputJump(Bytecode jump_bytecode,
BytecodeLabel* label);
- void PatchJump(size_t jump_target, size_t jump_location);
- void PatchJumpWith8BitOperand(ZoneVector<uint8_t>* bytecodes,
- size_t jump_location, int delta);
- void PatchJumpWith16BitOperand(ZoneVector<uint8_t>* bytecodes,
- size_t jump_location, int delta);
- void PatchJumpWith32BitOperand(ZoneVector<uint8_t>* bytecodes,
- size_t jump_location, int delta);
- void LeaveBasicBlock();
-
- bool OperandIsValid(Bytecode bytecode, OperandScale operand_scale,
- int operand_index, uint32_t operand_value) const;
- bool RegisterIsValid(Register reg, OperandSize reg_size) const;
+ bool RegisterIsValid(Register reg) const;
+ bool OperandsAreValid(Bytecode bytecode, int operand_count,
+ uint32_t operand0 = 0, uint32_t operand1 = 0,
+ uint32_t operand2 = 0, uint32_t operand3 = 0) const;
// Attach latest source position to |node|.
void AttachSourceInfo(BytecodeNode* node);
@@ -337,6 +334,8 @@
// during bytecode generation.
BytecodeArrayBuilder& Illegal();
+ void LeaveBasicBlock() { return_seen_in_block_ = false; }
+
Isolate* isolate() const { return isolate_; }
BytecodeArrayWriter* bytecode_array_writer() {
return &bytecode_array_writer_;
@@ -351,18 +350,13 @@
HandlerTableBuilder* handler_table_builder() {
return &handler_table_builder_;
}
- SourcePositionTableBuilder* source_position_table_builder() {
- return &source_position_table_builder_;
- }
Isolate* isolate_;
Zone* zone_;
bool bytecode_generated_;
ConstantArrayBuilder constant_array_builder_;
HandlerTableBuilder handler_table_builder_;
- SourcePositionTableBuilder source_position_table_builder_;
- bool exit_seen_in_block_;
- int unbound_jumps_;
+ bool return_seen_in_block_;
int parameter_count_;
int local_register_count_;
int context_register_count_;
@@ -375,47 +369,6 @@
DISALLOW_COPY_AND_ASSIGN(BytecodeArrayBuilder);
};
-
-// A label representing a branch target in a bytecode array. When a
-// label is bound, it represents a known position in the bytecode
-// array. For labels that are forward references there can be at most
-// one reference whilst it is unbound.
-class BytecodeLabel final {
- public:
- BytecodeLabel() : bound_(false), offset_(kInvalidOffset) {}
-
- bool is_bound() const { return bound_; }
- size_t offset() const { return offset_; }
-
- private:
- static const size_t kInvalidOffset = static_cast<size_t>(-1);
-
- void bind_to(size_t offset) {
- DCHECK(!bound_ && offset != kInvalidOffset);
- offset_ = offset;
- bound_ = true;
- }
-
- void set_referrer(size_t offset) {
- DCHECK(!bound_ && offset != kInvalidOffset && offset_ == kInvalidOffset);
- offset_ = offset;
- }
-
- bool is_forward_target() const {
- return offset() != kInvalidOffset && !is_bound();
- }
-
- // There are three states for a label:
- // bound_ offset_
- // UNSET false kInvalidOffset
- // FORWARD_TARGET false Offset of referring jump
- // BACKWARD_TARGET true Offset of label in bytecode array when bound
- bool bound_;
- size_t offset_;
-
- friend class BytecodeArrayBuilder;
-};
-
} // namespace interpreter
} // namespace internal
} // namespace v8