diff options
| author | Stephen Hines <srhines@google.com> | 2014-07-21 00:45:20 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-07-21 00:45:20 -0700 |
| commit | c6a4f5e819217e1e12c458aed8e7b122e23a3a58 (patch) | |
| tree | 81b7dd2bb4370a392f31d332a566c903b5744764 /unittests/ExecutionEngine/MCJIT/MCJITMemoryManagerTest.cpp | |
| parent | 19c6fbb3e8aaf74093afa08013134b61fa08f245 (diff) | |
| download | external_llvm-c6a4f5e819217e1e12c458aed8e7b122e23a3a58.tar.gz external_llvm-c6a4f5e819217e1e12c458aed8e7b122e23a3a58.tar.bz2 external_llvm-c6a4f5e819217e1e12c458aed8e7b122e23a3a58.zip | |
Update LLVM for rebase to r212749.
Includes a cherry-pick of:
r212948 - fixes a small issue with atomic calls
Change-Id: Ib97bd980b59f18142a69506400911a6009d9df18
Diffstat (limited to 'unittests/ExecutionEngine/MCJIT/MCJITMemoryManagerTest.cpp')
| -rw-r--r-- | unittests/ExecutionEngine/MCJIT/MCJITMemoryManagerTest.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/unittests/ExecutionEngine/MCJIT/MCJITMemoryManagerTest.cpp b/unittests/ExecutionEngine/MCJIT/MCJITMemoryManagerTest.cpp index f862999da8..98587f7e85 100644 --- a/unittests/ExecutionEngine/MCJIT/MCJITMemoryManagerTest.cpp +++ b/unittests/ExecutionEngine/MCJIT/MCJITMemoryManagerTest.cpp @@ -23,10 +23,10 @@ TEST(MCJITMemoryManagerTest, BasicAllocations) { uint8_t *code2 = MemMgr->allocateCodeSection(256, 0, 3, ""); uint8_t *data2 = MemMgr->allocateDataSection(256, 0, 4, "", false); - EXPECT_NE((uint8_t*)0, code1); - EXPECT_NE((uint8_t*)0, code2); - EXPECT_NE((uint8_t*)0, data1); - EXPECT_NE((uint8_t*)0, data2); + EXPECT_NE((uint8_t*)nullptr, code1); + EXPECT_NE((uint8_t*)nullptr, code2); + EXPECT_NE((uint8_t*)nullptr, data1); + EXPECT_NE((uint8_t*)nullptr, data2); // Initialize the data for (unsigned i = 0; i < 256; ++i) { @@ -56,10 +56,10 @@ TEST(MCJITMemoryManagerTest, LargeAllocations) { uint8_t *code2 = MemMgr->allocateCodeSection(0x100000, 0, 3, ""); uint8_t *data2 = MemMgr->allocateDataSection(0x100000, 0, 4, "", false); - EXPECT_NE((uint8_t*)0, code1); - EXPECT_NE((uint8_t*)0, code2); - EXPECT_NE((uint8_t*)0, data1); - EXPECT_NE((uint8_t*)0, data2); + EXPECT_NE((uint8_t*)nullptr, code1); + EXPECT_NE((uint8_t*)nullptr, code2); + EXPECT_NE((uint8_t*)nullptr, data1); + EXPECT_NE((uint8_t*)nullptr, data2); // Initialize the data for (unsigned i = 0; i < 0x100000; ++i) { @@ -98,8 +98,8 @@ TEST(MCJITMemoryManagerTest, ManyAllocations) { data[i][j] = 2 + (i % 254); } - EXPECT_NE((uint8_t *)0, code[i]); - EXPECT_NE((uint8_t *)0, data[i]); + EXPECT_NE((uint8_t *)nullptr, code[i]); + EXPECT_NE((uint8_t *)nullptr, data[i]); } // Verify the data (this is checking for overlaps in the addresses) @@ -141,8 +141,8 @@ TEST(MCJITMemoryManagerTest, ManyVariedAllocations) { data[i][j] = 2 + (i % 254); } - EXPECT_NE((uint8_t *)0, code[i]); - EXPECT_NE((uint8_t *)0, data[i]); + EXPECT_NE((uint8_t *)nullptr, code[i]); + EXPECT_NE((uint8_t *)nullptr, data[i]); uintptr_t CodeAlign = Align ? (uintptr_t)code[i] % Align : 0; uintptr_t DataAlign = Align ? (uintptr_t)data[i] % Align : 0; |