diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2018-08-06 14:55:21 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2018-08-10 14:16:09 +0000 |
| commit | 18d2f78437d28987297148b63b99ceed6313a78a (patch) | |
| tree | 845e016b002a123e394df43fcf88cf2dc7ee1fb6 /src/3rdparty/masm/assembler/MacroAssembler.h | |
| parent | 577630fe4a1f6a129239788080ff9e802118fd26 (diff) | |
Update Yarr to the latest version from WebKit
Updated Yarr to a to commit
4d2a53d60487cb1f8b2a9a1e9f684af336fd7d2c in WebKit.
Adjusted the yarr code base to work with our older version of
wtf and masm.
Change-Id: I04b4593ece051e1d7aa087b87aa08c92595d1098
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/3rdparty/masm/assembler/MacroAssembler.h')
| -rw-r--r-- | src/3rdparty/masm/assembler/MacroAssembler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/masm/assembler/MacroAssembler.h b/src/3rdparty/masm/assembler/MacroAssembler.h index 20ddcadae1..77aec128e5 100644 --- a/src/3rdparty/masm/assembler/MacroAssembler.h +++ b/src/3rdparty/masm/assembler/MacroAssembler.h @@ -805,7 +805,7 @@ public: Jump branchPtr(RelationalCondition cond, RegisterID left, RegisterID right) { - return branch64(cond, left, right); + return this->branch64(cond, left, right); } Jump branchPtr(RelationalCondition cond, RegisterID left, TrustedImmPtr right) @@ -840,7 +840,7 @@ public: Jump branchTestPtr(ResultCondition cond, RegisterID reg, TrustedImm32 mask = TrustedImm32(-1)) { - return branchTest64(cond, reg, mask); + return this->branchTest64(cond, reg, mask); } Jump branchTestPtr(ResultCondition cond, Address address, TrustedImm32 mask = TrustedImm32(-1)) |