RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2024-12-14 07:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "ValueMapper: Make LocalAsMetadata match function-local Values"

Browse Source 
This reverts commit r265631, since it caused bot failures:
http://lab.llvm.org:8011/builders/clang-ppc64be-linux/builds/3256
http://lab.llvm.org:8011/builders/clang-cmake-aarch64-42vma/builds/7272

Looks like something is depending on the old behaviour.  I'll try to
track it down and recommit.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@265637 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Duncan P. N. Exon Smith 2016-04-07 02:10:50 +00:00
parent 8465c13741
commit fcdd17bc64
2 changed files with 16 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lib/Transforms/Utils/ValueMapper.cpp
View File

@ -86,9 +86,6 @@ public:
/// (not an MDNode, or MDNode::isResolved() returns true). /// (not an MDNode, or MDNode::isResolved() returns true).
Metadata *mapMetadata(const Metadata *MD); Metadata *mapMetadata(const Metadata *MD);
// Map LocalAsMetadata, which never gets memoized.
Metadata *mapLocalAsMetadata(const LocalAsMetadata &LAM);
private: private:
Value *mapBlockAddress(const BlockAddress &BA); Value *mapBlockAddress(const BlockAddress &BA);
@ -297,27 +294,18 @@ Value *Mapper::mapValue(const Value *V) {
if (const auto *MDV = dyn_cast<MetadataAsValue>(V)) { if (const auto *MDV = dyn_cast<MetadataAsValue>(V)) {
const Metadata *MD = MDV->getMetadata(); const Metadata *MD = MDV->getMetadata();
// Locals shouldn't be memoized. Return nullptr if mapLocalAsMetadata()
// returns nullptr; otherwise bridge back to the Value hierarchy.
if (auto *LAM = dyn_cast<LocalAsMetadata>(MD)) {
if (auto *MappedMD = mapLocalAsMetadata(*LAM)) {
if (LAM == MappedMD)
return const_cast<Value *>(V);
return MetadataAsValue::get(V->getContext(), MappedMD);
}
return nullptr;
}
// If this is a module-level metadata and we know that nothing at the module // If this is a module-level metadata and we know that nothing at the module
// level is changing, then use an identity mapping. // level is changing, then use an identity mapping.
if (Flags & RF_NoModuleLevelChanges) if (!isa<LocalAsMetadata>(MD) && (Flags & RF_NoModuleLevelChanges))
return VM[V] = const_cast<Value *>(V); return VM[V] = const_cast<Value *>(V);
// Map the metadata and turn it into a value. // FIXME: be consistent with function-local values for LocalAsMetadata by
// returning nullptr when LocalAsMetadata is missing. Adding a mapping is
// expensive.
auto *MappedMD = mapMetadata(MD); auto *MappedMD = mapMetadata(MD);
if (MD == MappedMD) if (MD == MappedMD || (!MappedMD && (Flags & RF_IgnoreMissingLocals)))
return VM[V] = const_cast<Value *>(V); return VM[V] = const_cast<Value *>(V);
return VM[V] = MetadataAsValue::get(V->getContext(), MappedMD); return VM[V] = MetadataAsValue::get(V->getContext(), MappedMD);
} }
@ -635,16 +623,21 @@ Optional<Metadata *> Mapper::mapSimpleMetadata(const Metadata *MD) {
if (isa<MDString>(MD)) if (isa<MDString>(MD))
return mapToSelf(MD); return mapToSelf(MD);
if (auto *CMD = dyn_cast<ConstantAsMetadata>(MD)) { if (isa<ConstantAsMetadata>(MD))
if ((Flags & RF_NoModuleLevelChanges)) if ((Flags & RF_NoModuleLevelChanges))
return mapToSelf(MD); return mapToSelf(MD);
// FIXME: Assert that this is not LocalAsMetadata. It should be handled
// elsewhere.
if (const auto *VMD = dyn_cast<ValueAsMetadata>(MD)) {
// Disallow recursion into metadata mapping through mapValue. // Disallow recursion into metadata mapping through mapValue.
VM.disableMapMetadata(); VM.disableMapMetadata();
Value *MappedV = mapValue(CMD->getValue()); Value *MappedV = mapValue(VMD->getValue());
VM.enableMapMetadata(); VM.enableMapMetadata();
if (CMD->getValue() == MappedV) // FIXME: Always use "ignore" behaviour. There should only be globals here.
if (VMD->getValue() == MappedV ||
(!MappedV && (Flags & RF_IgnoreMissingLocals)))
return mapToSelf(MD); return mapToSelf(MD);
return mapToMetadata(MD, MappedV ? ValueAsMetadata::get(MappedV) : nullptr); return mapToMetadata(MD, MappedV ? ValueAsMetadata::get(MappedV) : nullptr);
@ -666,24 +659,9 @@ Metadata *llvm::MapMetadata(const Metadata *MD, ValueToValueMapTy &VM,
return Mapper(VM, Flags, TypeMapper, Materializer).mapMetadata(MD); return Mapper(VM, Flags, TypeMapper, Materializer).mapMetadata(MD);
} }
Metadata *Mapper::mapLocalAsMetadata(const LocalAsMetadata &LAM) {
if (Optional<Metadata *> NewMD = VM.getMappedMD(&LAM))
return *NewMD;
// Lookup the mapping for the value itself, and return the appropriate
// metadata.
if (Value *V = mapValue(LAM.getValue())) {
if (V == LAM.getValue())
return const_cast<LocalAsMetadata *>(&LAM);
return ValueAsMetadata::get(V);
}
return nullptr;
}
Metadata *Mapper::mapMetadata(const Metadata *MD) { Metadata *Mapper::mapMetadata(const Metadata *MD) {
if (auto *LAM = dyn_cast<LocalAsMetadata>(MD)) // FIXME: First check for and deal with LocalAsMetadata, so that
return mapLocalAsMetadata(*LAM); // mapSimpleMetadata() doesn't need to deal with it.
if (Optional<Metadata *> NewMD = mapSimpleMetadata(MD)) if (Optional<Metadata *> NewMD = mapSimpleMetadata(MD))
return *NewMD; return *NewMD;

82
unittests/Transforms/Utils/ValueMapperTest.cpp
View File

@ -127,88 +127,6 @@ TEST(ValueMapperTest, MapMetadataSeededWithNull) {
EXPECT_EQ(nullptr, MapMetadata(D, VM, RF_None)); EXPECT_EQ(nullptr, MapMetadata(D, VM, RF_None));
} }
TEST(ValueMapperTest, MapMetadataLocalAsMetadata) {
LLVMContext C;
FunctionType *FTy =
FunctionType::get(Type::getVoidTy(C), Type::getInt8Ty(C), false);
std::unique_ptr<Function> F(
Function::Create(FTy, GlobalValue::ExternalLinkage, "F"));
Argument &A = *F->arg_begin();
auto *LAM = LocalAsMetadata::get(&A);
ValueToValueMapTy VM;
EXPECT_EQ(nullptr, MapMetadata(LAM, VM));
EXPECT_EQ(nullptr, MapMetadata(LAM, VM, RF_IgnoreMissingLocals));
EXPECT_EQ(None, VM.getMappedMD(LAM));
VM.MD()[LAM].reset(LAM);
EXPECT_EQ(LAM, MapMetadata(LAM, VM));
EXPECT_EQ(LAM, MapMetadata(LAM, VM, RF_IgnoreMissingLocals));
auto *N = MDNode::get(C, None);
VM.MD()[LAM].reset(N);
EXPECT_EQ(N, MapMetadata(LAM, VM));
EXPECT_EQ(N, MapMetadata(LAM, VM, RF_IgnoreMissingLocals));
}
TEST(ValueMapperTest, MapMetadataConstantAsMetadata) {
LLVMContext C;
FunctionType *FTy =
FunctionType::get(Type::getVoidTy(C), Type::getInt8Ty(C), false);
std::unique_ptr<Function> F(
Function::Create(FTy, GlobalValue::ExternalLinkage, "F"));
auto *CAM = ConstantAsMetadata::get(F.get());
{
ValueToValueMapTy VM;
EXPECT_EQ(CAM, MapMetadata(CAM, VM));
EXPECT_TRUE(VM.MD().count(CAM));
VM.MD().erase(CAM);
EXPECT_EQ(CAM, MapMetadata(CAM, VM, RF_IgnoreMissingLocals));
EXPECT_TRUE(VM.MD().count(CAM));
auto *N = MDNode::get(C, None);
VM.MD()[CAM].reset(N);
EXPECT_EQ(N, MapMetadata(CAM, VM));
EXPECT_EQ(N, MapMetadata(CAM, VM, RF_IgnoreMissingLocals));
}
std::unique_ptr<Function> F2(
Function::Create(FTy, GlobalValue::ExternalLinkage, "F2"));
ValueToValueMapTy VM;
VM[F.get()] = F2.get();
auto *F2MD = MapMetadata(CAM, VM);
EXPECT_TRUE(VM.MD().count(CAM));
EXPECT_TRUE(F2MD);
EXPECT_EQ(F2.get(), cast<ConstantAsMetadata>(F2MD)->getValue());
}
TEST(ValueMapperTest, MapValueLocalAsMetadata) {
LLVMContext C;
FunctionType *FTy =
FunctionType::get(Type::getVoidTy(C), Type::getInt8Ty(C), false);
std::unique_ptr<Function> F(
Function::Create(FTy, GlobalValue::ExternalLinkage, "F"));
Argument &A = *F->arg_begin();
auto *LAM = LocalAsMetadata::get(&A);
auto *MAV = MetadataAsValue::get(C, LAM);
ValueToValueMapTy VM;
EXPECT_EQ(nullptr, MapValue(MAV, VM));
EXPECT_EQ(nullptr, MapValue(MAV, VM, RF_IgnoreMissingLocals));
EXPECT_FALSE(VM.count(MAV));
EXPECT_FALSE(VM.count(&A));
VM[MAV] = MAV;
EXPECT_EQ(MAV, MapValue(MAV, VM));
EXPECT_EQ(MAV, MapValue(MAV, VM, RF_IgnoreMissingLocals));
VM[MAV] = &A;
EXPECT_EQ(&A, MapValue(MAV, VM));
EXPECT_EQ(&A, MapValue(MAV, VM, RF_IgnoreMissingLocals));
}
TEST(ValueMapperTest, MapMetadataNullMapGlobalWithIgnoreMissingLocals) { TEST(ValueMapperTest, MapMetadataNullMapGlobalWithIgnoreMissingLocals) {
LLVMContext C; LLVMContext C;
FunctionType *FTy = FunctionType *FTy =