diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-26 01:00:14 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-26 01:00:14 +0200 |
| commit | 9ff4c5c2168fcc616770389ee826190708258114 (patch) | |
| tree | 2db3d972e2a6e2bf16cf0280e074ffa00aaa55f1 /src/qml/jit | |
| parent | 30b3b8a7603a9963d17cf8520fda7252841cda91 (diff) | |
| parent | 9a44e3b6ca81f0e84d774a95e45b449b5d4cb583 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I626068886d4440b569dbeb1789b1ebfa480000c5
Diffstat (limited to 'src/qml/jit')
| -rw-r--r-- | src/qml/jit/qv4assembler.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/qml/jit/qv4assembler.cpp b/src/qml/jit/qv4assembler.cpp index 45dc87db19..79e6312b26 100644 --- a/src/qml/jit/qv4assembler.cpp +++ b/src/qml/jit/qv4assembler.cpp @@ -62,7 +62,6 @@ namespace JIT { #define callHelper(x) PlatformAssemblerCommon::callRuntime(#x, reinterpret_cast<void *>(&x)) const QV4::Value::ValueTypeInternal IntegerTag = QV4::Value::ValueTypeInternal::Integer; -const int IsIntegerConvertible_Shift = QV4::Value::IsIntegerConvertible_Shift; static ReturnedValue toNumberHelper(ReturnedValue v) { @@ -885,7 +884,7 @@ struct PlatformAssembler64 : PlatformAssemblerCommon Jump unopIntPath(std::function<Jump(void)> fastPath) { - urshift64(AccumulatorRegister, TrustedImm32(IsIntegerConvertible_Shift), ScratchRegister); + urshift64(AccumulatorRegister, TrustedImm32(Value::IsIntegerConvertible_Shift), ScratchRegister); Jump accNotIntConvertible = branch32(NotEqual, TrustedImm32(1), ScratchRegister); // both integer |