From 1dac47c1418b44cf4a56b42bfca2b277795fd213 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Tue, 11 Sep 2018 11:07:32 +0200 Subject: Cleanups in Value/Primitive Get rid of Primitive and move the corresponding methods directly into Value. Mark many methods in Value as constexpr and turn Value into a POD type again. Keep Primitive as a pure alias to Value for source compatibility of other modules that might be using it. Change-Id: Icb47458947dd3482c8852e95782123ea4346f5ec Reviewed-by: Simon Hausmann --- src/qml/jit/qv4baselineassembler.cpp | 10 +++++----- src/qml/jit/qv4baselinejit.cpp | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/qml/jit') diff --git a/src/qml/jit/qv4baselineassembler.cpp b/src/qml/jit/qv4baselineassembler.cpp index c822a0f371..ce71dbdb5e 100644 --- a/src/qml/jit/qv4baselineassembler.cpp +++ b/src/qml/jit/qv4baselineassembler.cpp @@ -170,12 +170,12 @@ public: Jump jumpEmpty() { - return branch64(Equal, AccumulatorRegister, TrustedImm64(Primitive::emptyValue().asReturnedValue())); + return branch64(Equal, AccumulatorRegister, TrustedImm64(Value::emptyValue().asReturnedValue())); } Jump jumpNotEmpty() { - return branch64(NotEqual, AccumulatorRegister, TrustedImm64(Primitive::emptyValue().asReturnedValue())); + return branch64(NotEqual, AccumulatorRegister, TrustedImm64(Value::emptyValue().asReturnedValue())); } void toBoolean(std::function continuation) @@ -637,12 +637,12 @@ public: Jump jumpEmpty() { - return branch32(Equal, AccumulatorRegisterTag, TrustedImm32(Primitive::emptyValue().asReturnedValue() >> 32)); + return branch32(Equal, AccumulatorRegisterTag, TrustedImm32(Value::emptyValue().asReturnedValue() >> 32)); } Jump jumpNotEmpty() { - return branch32(NotEqual, AccumulatorRegisterTag, TrustedImm32(Primitive::emptyValue().asReturnedValue() >> 32)); + return branch32(NotEqual, AccumulatorRegisterTag, TrustedImm32(Value::emptyValue().asReturnedValue() >> 32)); } void toBoolean(std::function continuation) @@ -1476,7 +1476,7 @@ void BaselineAssembler::getException() pasm()->store8(TrustedImm32(0), hasExceptionAddr); auto done = pasm()->jump(); nope.link(pasm()); - pasm()->loadValue(Primitive::emptyValue().asReturnedValue()); + pasm()->loadValue(Value::emptyValue().asReturnedValue()); done.link(pasm()); } diff --git a/src/qml/jit/qv4baselinejit.cpp b/src/qml/jit/qv4baselinejit.cpp index f8be5fb140..7b4f2b00e7 100644 --- a/src/qml/jit/qv4baselinejit.cpp +++ b/src/qml/jit/qv4baselinejit.cpp @@ -970,7 +970,7 @@ void BaselineJIT::generate_LoadQmlImportedScripts(int result) void BaselineJIT::generate_InitializeBlockDeadTemporalZone(int firstReg, int count) { - as->loadValue(Primitive::emptyValue().rawValue()); + as->loadValue(Value::emptyValue().rawValue()); for (int i = firstReg, end = firstReg + count; i < end; ++i) as->storeReg(i); } -- cgit v1.2.3