diff options
| author | Christopher Ferris <cferris@google.com> | 2014-07-11 06:44:39 +0000 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2014-07-11 06:44:39 +0000 |
| commit | d4415e8bd04c4a9367744ff0149597b4f37a0e0a (patch) | |
| tree | 97c42c08fd04034cf6cecadb39644bf9531be0f1 /runtime/class_linker_test.cc | |
| parent | a9b870b73a155ce70c867d5b3f9758fab0b45f07 (diff) | |
| download | art-d4415e8bd04c4a9367744ff0149597b4f37a0e0a.zip art-d4415e8bd04c4a9367744ff0149597b4f37a0e0a.tar.gz art-d4415e8bd04c4a9367744ff0149597b4f37a0e0a.tar.bz2 | |
Revert "Revert "Add intrinsic for Reference.get()""
This reverts commit a9b870b73a155ce70c867d5b3f9758fab0b45f07.
Change-Id: Ic2a9b47f2b911bef4b764d10bc33cf000e4b4211
Diffstat (limited to 'runtime/class_linker_test.cc')
| -rw-r--r-- | runtime/class_linker_test.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/runtime/class_linker_test.cc b/runtime/class_linker_test.cc index 04f6946..8fdead6 100644 --- a/runtime/class_linker_test.cc +++ b/runtime/class_linker_test.cc @@ -626,6 +626,13 @@ struct ReferenceOffsets : public CheckOffsets<mirror::Reference> { }; }; +struct ReferenceClassOffsets : public CheckOffsets<mirror::ReferenceClass> { + ReferenceClassOffsets() : CheckOffsets<mirror::ReferenceClass>(true, "Ljava/lang/ref/Reference;") { + offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::ReferenceClass, disable_intrinsic_), "disableIntrinsic")); + offsets.push_back(CheckOffset(OFFSETOF_MEMBER(mirror::ReferenceClass, slow_path_enabled_), "slowPathEnabled")); + }; +}; + struct FinalizerReferenceOffsets : public CheckOffsets<mirror::FinalizerReference> { FinalizerReferenceOffsets() : CheckOffsets<mirror::FinalizerReference>(false, "Ljava/lang/ref/FinalizerReference;") { // alphabetical references @@ -651,6 +658,7 @@ TEST_F(ClassLinkerTest, ValidateFieldOrderOfJavaCppUnionClasses) { EXPECT_TRUE(ProxyOffsets().Check()); EXPECT_TRUE(DexCacheOffsets().Check()); EXPECT_TRUE(ReferenceOffsets().Check()); + EXPECT_TRUE(ReferenceClassOffsets().Check()); EXPECT_TRUE(FinalizerReferenceOffsets().Check()); EXPECT_TRUE(ClassClassOffsets().Check()); |