commit f53580b063d9a206e72a2b4166aff2c62e71555d
author Nicolas Capens <capn@google.com> Wed Sep 28 07:20:30 2016 -0400
committer Nicolas Capens <nicolascapens@google.com> Thu Sep 29 01:32:05 2016 +0000
tree 7c430001a7dca4177e8706edcfe6d0b6a6a249f1
parent fe93fdd5e29d7470eee6d41eb70075ad9415d227

Don't emit address size prefixes for native x86-64 ABI.

Address size prefixes are used in 64-bit x86 for PNaCl's use of the
x32 ABI with ILP32 data model. Don't emit them for any other ABI.

BUG=swiftshader:9

Change-Id: I1351db086d44ce4b144b3428866a54e84637b9a4
Reviewed-on: https://chromium-review.googlesource.com/390409
Reviewed-by: Jim Stichnoth <stichnot@chromium.org>
Tested-by: Nicolas Capens <nicolascapens@google.com>

src/IceTargetLoweringX8664.h

diff --git a/src/IceTargetLoweringX8664.h b/src/IceTargetLoweringX8664.h
index 69500f0..e90f66a 100644
--- a/src/IceTargetLoweringX8664.h
+++ b/src/IceTargetLoweringX8664.h
@@ -42,7 +42,9 @@
   }
 
   std::unique_ptr<::Ice::Assembler> createAssembler() const override {
-    const bool EmitAddrSizeOverridePrefix = !NeedSandboxing;
+    const bool EmitAddrSizeOverridePrefix =
+        !NeedSandboxing &&
+        getFlags().getApplicationBinaryInterface() == ABI_PNaCl;
     return makeUnique<X8664::AssemblerX8664>(EmitAddrSizeOverridePrefix);
   }