maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert r336760: "[ORC] Add unit tests for the reexports utility that were..." 

This patch broke a few buildbots. I will investigate and re-apply when I have
a fix.

llvm-svn: 336767
This commit is contained in:
Lang Hames 2018-07-11 06:46:17 +00:00
parent 1d6a80cd95
commit 709f773a88
2 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/ExecutionEngine/Orc/Core.cpp
View File

@ -462,7 +462,7 @@ void ReExportsMaterializationUnit::materialize(
// FIXME: We're creating a SymbolFlagsMap and a std::map of
// std::sets just to add one dependency here. This needs a
// re-think.
Resolved.insert(KV.second.Aliasee);
Resolved.insert(KV.first);
}
QueryInfo->R.resolve(ResolutionMap);

42
llvm/unittests/ExecutionEngine/Orc/CoreAPIsTest.cpp
View File

@ -300,48 +300,6 @@ TEST_F(CoreAPIsStandardTest, TestChainedAliases) {
<< "\"Baz\"'s address should match \"Foo\"'s";
}
TEST_F(CoreAPIsStandardTest, TestBasicReExports) {
// Test that the basic use case of re-exporting a single symbol from another
// VSO works.
cantFail(V.define(absoluteSymbols({{Foo, FooSym}})));
auto &V2 = ES.createVSO("V2");
cantFail(V2.define(reexports(V, {{Bar, {Foo, BarSym.getFlags()}}})));
auto Result = cantFail(lookup({&V2}, Bar));
EXPECT_EQ(Result.getAddress(), FooSym.getAddress())
<< "Re-export Bar for symbol Foo should match FooSym's address";
}
TEST_F(CoreAPIsStandardTest, TestThatReExportsDontUnnecessarilyMaterialize) {
// Test that re-exports do not materialize symbols that have not been queried
// for.
cantFail(V.define(absoluteSymbols({{Foo, FooSym}})));
bool BarMaterialized = false;
auto BarMU = llvm::make_unique<SimpleMaterializationUnit>(
SymbolFlagsMap({{Bar, BarSym.getFlags()}}),
[&](MaterializationResponsibility R) {
BarMaterialized = true;
R.resolve({{Bar, BarSym}});
R.finalize();
});
cantFail(V.define(BarMU));
auto &V2 = ES.createVSO("V2");
cantFail(V2.define(reexports(
V, {{Baz, {Foo, BazSym.getFlags()}}, {Qux, {Bar, QuxSym.getFlags()}}})));
auto Result = cantFail(lookup({&V2}, Baz));
EXPECT_EQ(Result.getAddress(), FooSym.getAddress())
<< "Re-export Baz for symbol Foo should match FooSym's address";
EXPECT_FALSE(BarMaterialized) << "Bar should not have been materialized";
}
TEST_F(CoreAPIsStandardTest, TestTrivialCircularDependency) {
Optional<MaterializationResponsibility> FooR;
auto FooMU = llvm::make_unique<SimpleMaterializationUnit>(