Fix -Wsign-compare warning and remove windows-style line endings introduced by r185421

llvm-svn: 185443

diff --git a/llvm/unittests/ExecutionEngine/JIT/JITMemoryManagerTest.cpp b/llvm/unittests/ExecutionEngine/JIT/JITMemoryManagerTest.cpp
index c06b89c..68ca53d 100644 (file)
--- a/llvm/unittests/ExecutionEngine/JIT/JITMemoryManagerTest.cpp
+++ b/llvm/unittests/ExecutionEngine/JIT/JITMemoryManagerTest.cpp
@@ -281,23 +281,23 @@ TEST(JITMemoryManagerTest, TestManyStubs) {
 TEST(JITMemoryManagerTest, AllocateSection) {
   OwningPtr<JITMemoryManager> MemMgr(
       JITMemoryManager::CreateDefaultMemManager());
-  uint8_t *code1 = MemMgr->allocateCodeSection(256, 0, 1);\r
-  uint8_t *data1 = MemMgr->allocateDataSection(256, 16, 2, true);\r
-  uint8_t *code2 = MemMgr->allocateCodeSection(257, 32, 3);\r
-  uint8_t *data2 = MemMgr->allocateDataSection(256, 64, 4, false);\r
-  uint8_t *code3 = MemMgr->allocateCodeSection(258, 64, 5);\r
-\r
-  EXPECT_NE((uint8_t*)0, code1);\r
-  EXPECT_NE((uint8_t*)0, code2);\r
-  EXPECT_NE((uint8_t*)0, data1);\r
-  EXPECT_NE((uint8_t*)0, data2);\r
-\r
-  // Check alignment\r
-  EXPECT_EQ((uint64_t)code1 & 0xf, 0);\r
-  EXPECT_EQ((uint64_t)code2 & 0x1f, 0);\r
-  EXPECT_EQ((uint64_t)code3 & 0x3f, 0);\r
-  EXPECT_EQ((uint64_t)data1 & 0xf, 0);\r
-  EXPECT_EQ((uint64_t)data2 & 0x3f, 0);\r
+  uint8_t *code1 = MemMgr->allocateCodeSection(256, 0, 1);
+  uint8_t *data1 = MemMgr->allocateDataSection(256, 16, 2, true);
+  uint8_t *code2 = MemMgr->allocateCodeSection(257, 32, 3);
+  uint8_t *data2 = MemMgr->allocateDataSection(256, 64, 4, false);
+  uint8_t *code3 = MemMgr->allocateCodeSection(258, 64, 5);
+
+  EXPECT_NE((uint8_t*)0, code1);
+  EXPECT_NE((uint8_t*)0, code2);
+  EXPECT_NE((uint8_t*)0, data1);
+  EXPECT_NE((uint8_t*)0, data2);
+
+  // Check alignment
+  EXPECT_EQ((uint64_t)code1 & 0xf, 0u);
+  EXPECT_EQ((uint64_t)code2 & 0x1f, 0u);
+  EXPECT_EQ((uint64_t)code3 & 0x3f, 0u);
+  EXPECT_EQ((uint64_t)data1 & 0xf, 0u);
+  EXPECT_EQ((uint64_t)data2 & 0x3f, 0u);
 }
 
 }