Failed to apply patch for src/compiler/interpreter-assembler.cc:
While running git apply --index -3 -p1;
error: patch failed: src/compiler/interpreter-assembler.cc:89
Falling back to three-way merge...
Applied patch to 'src/compiler/interpreter-assembler.cc' with conflicts.
U src/compiler/interpreter-assembler.cc
Patch: src/compiler/interpreter-assembler.cc
Index: src/compiler/interpreter-assembler.cc
diff --git a/src/compiler/interpreter-assembler.cc
b/src/compiler/interpreter-assembler.cc
index
691fa61db576a0b7030373df7e51da2b405b6ce9..45466af8c0c4f10b4985719ac3db52664608895b
100644
--- a/src/compiler/interpreter-assembler.cc
+++ b/src/compiler/interpreter-assembler.cc
@@ -89,8 +89,8 @@ Node* InterpreterAssembler::RegisterFrameOffset(Node*
index) {
}
-Node* InterpreterAssembler::BytecodeArg(int delta) {
- DCHECK_LT(delta, interpreter::Bytecodes::NumberOfArguments(bytecode_));
+Node* InterpreterAssembler::BytecodeOperand(int delta) {
+ DCHECK_LT(delta, interpreter::Bytecodes::NumberOfOperands(bytecode_));
return raw_assembler_->Load(kMachUint8, BytecodePointer(),
Int32Constant(1 + delta));
}
https://codereview.chromium.org/1257543003/
--
--
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.
