diff options
| author | 2015-12-18 23:06:54 +0000 | |
|---|---|---|
| committer | 2015-12-18 23:06:54 +0000 | |
| commit | e3e6822adde3b53c84723a78412c4bd9eb812da6 (patch) | |
| tree | 55bb421dd5e9e2a9c1119e57af56f98afb712ecb /compiler/optimizing/intrinsics_mips64.cc | |
| parent | 65b5183b0ae0042ab917eb8afd4f236669c3935d (diff) | |
| parent | 273941131aed5248a8c75b2d3f2952a88c7ab02d (diff) | |
Merge "Disable the UnsafeCASObject intrinsic with read barriers."
am: 273941131a
* commit '273941131aed5248a8c75b2d3f2952a88c7ab02d':
Disable the UnsafeCASObject intrinsic with read barriers.
Diffstat (limited to 'compiler/optimizing/intrinsics_mips64.cc')
| -rw-r--r-- | compiler/optimizing/intrinsics_mips64.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/optimizing/intrinsics_mips64.cc b/compiler/optimizing/intrinsics_mips64.cc index 8aa7d9ff6f..8b45ea7c4f 100644 --- a/compiler/optimizing/intrinsics_mips64.cc +++ b/compiler/optimizing/intrinsics_mips64.cc @@ -1299,6 +1299,8 @@ static void GenCas(LocationSummary* locations, Primitive::Type type, CodeGenerat if (type == Primitive::kPrimLong) { __ Lld(out, TMP); } else { + // Note: We will need a read barrier here, when read barrier + // support is added to the MIPS64 back end. __ Ll(out, TMP); } __ Dsubu(out, out, expected); // If we didn't get the 'expected' |