From ad4a911feac0150f6bc5400ee9a8732adfd35f36 Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Mon, 1 Aug 2016 20:49:11 +0000 Subject: [ExecutionEngine][MCJIT][Orc] Replace RuntimeDyld::SymbolInfo with JITSymbol. This patch replaces RuntimeDyld::SymbolInfo with JITSymbol: A symbol class that is capable of lazy materialization (i.e. the symbol definition needn't be emitted until the address is requested). This can be used to support common and weak symbols in the JIT (though this is not implemented in this patch). For consistency, RuntimeDyld::SymbolResolver is renamed to JITSymbolResolver. For space efficiency a new class, JITEvaluatedSymbol, is introduced that behaves like the old RuntimeDyld::SymbolInfo - i.e. it is just a pair of an address and symbol flags. Instances of JITEvaluatedSymbol can be used in symbol-tables to avoid paying the space cost of the materializer. llvm-svn: 277386 --- llvm/unittests/ExecutionEngine/Orc/GlobalMappingLayerTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'llvm/unittests/ExecutionEngine/Orc/GlobalMappingLayerTest.cpp') diff --git a/llvm/unittests/ExecutionEngine/Orc/GlobalMappingLayerTest.cpp b/llvm/unittests/ExecutionEngine/Orc/GlobalMappingLayerTest.cpp index 054fc16cabd..25b6c891c62 100644 --- a/llvm/unittests/ExecutionEngine/Orc/GlobalMappingLayerTest.cpp +++ b/llvm/unittests/ExecutionEngine/Orc/GlobalMappingLayerTest.cpp @@ -21,7 +21,7 @@ struct MockBaseLayer { JITSymbol findSymbol(const std::string &Name, bool ExportedSymbolsOnly) { if (Name == "bar") - return llvm::orc::JITSymbol(0x4567, JITSymbolFlags::Exported); + return llvm::JITSymbol(0x4567, JITSymbolFlags::Exported); return nullptr; } @@ -37,13 +37,13 @@ TEST(GlobalMappingLayerTest, Empty) { // Test fall-through for symbol in base layer. auto BarSym = L.findSymbol("bar", true); - EXPECT_EQ(BarSym.getAddress(), static_cast(0x4567)) + EXPECT_EQ(BarSym.getAddress(), static_cast(0x4567)) << "Symbol lookup fall-through failed."; // Test setup of a global mapping. L.setGlobalMapping("foo", 0x0123); auto FooSym2 = L.findSymbol("foo", true); - EXPECT_EQ(FooSym2.getAddress(), static_cast(0x0123)) + EXPECT_EQ(FooSym2.getAddress(), static_cast(0x0123)) << "Symbol mapping setup failed."; // Test removal of a global mapping. -- cgit v1.2.3