diff options
| author | 2014-10-17 02:29:32 +0000 | |
|---|---|---|
| committer | 2014-10-17 02:29:32 +0000 | |
| commit | b3f18cf7466f85e15c6b7f005f544867a4d6847a (patch) | |
| tree | 62035f08dc38038b74c9796118ae0bab0e7608fb /compiler/optimizing | |
| parent | cb142101f29a4f1e097f03a220db3da6d4bd679f (diff) | |
| parent | 6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3 (diff) | |
Merge "Make ART compile with GCC -O0 again."
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/gvn.h | 3 | ||||
| -rw-r--r-- | compiler/optimizing/register_allocator.h | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/compiler/optimizing/gvn.h b/compiler/optimizing/gvn.h index 41b3ceb509..a98d714476 100644 --- a/compiler/optimizing/gvn.h +++ b/compiler/optimizing/gvn.h @@ -17,7 +17,6 @@ #ifndef ART_COMPILER_OPTIMIZING_GVN_H_ #define ART_COMPILER_OPTIMIZING_GVN_H_ -#include <gtest/gtest.h> #include "nodes.h" namespace art { @@ -221,7 +220,7 @@ class GlobalValueNumberer : public ValueObject { // Mark visisted blocks. Only used for debugging. GrowableArray<bool> visited_; - FRIEND_TEST(GVNTest, LoopSideEffects); + ART_FRIEND_TEST(GVNTest, LoopSideEffects); DISALLOW_COPY_AND_ASSIGN(GlobalValueNumberer); }; diff --git a/compiler/optimizing/register_allocator.h b/compiler/optimizing/register_allocator.h index d4c233a7f8..0c3a9b3818 100644 --- a/compiler/optimizing/register_allocator.h +++ b/compiler/optimizing/register_allocator.h @@ -21,8 +21,6 @@ #include "primitive.h" #include "utils/growable_array.h" -#include "gtest/gtest.h" - namespace art { class CodeGenerator; @@ -189,7 +187,7 @@ class RegisterAllocator { // The maximum live registers at safepoints. size_t maximum_number_of_live_registers_; - FRIEND_TEST(RegisterAllocatorTest, FreeUntil); + ART_FRIEND_TEST(RegisterAllocatorTest, FreeUntil); DISALLOW_COPY_AND_ASSIGN(RegisterAllocator); }; |