X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=lib%2FTransforms%2FUtils%2FValueMapper.cpp;fp=lib%2FTransforms%2FUtils%2FValueMapper.cpp;h=1add78e01657ff8a2277451a103f1fb8887348fd;hp=00ee3385981b4fe635648206c47ac4ce5f5eb4c9;hb=e8df234a6ea0dbc20e4da677f2f9f8c426f44246;hpb=ec08d99feee1ebbc5176d01e1c6cb021ade1eb37

diff --git a/lib/Transforms/Utils/ValueMapper.cpp b/lib/Transforms/Utils/ValueMapper.cpp
index 00ee3385981..1add78e0165 100644
--- a/lib/Transforms/Utils/ValueMapper.cpp
+++ b/lib/Transforms/Utils/ValueMapper.cpp
@@ -197,6 +197,10 @@ static Metadata *mapMetadataOp(Metadata *Op,
                                ValueMaterializer *Materializer) {
   if (!Op)
     return nullptr;
+
+  if (Materializer && !Materializer->isMetadataNeeded(Op))
+    return nullptr;
+
   if (Metadata *MappedOp = MapMetadataImpl(Op, DistinctWorklist, VM, Flags,
                                            TypeMapper, Materializer))
     return MappedOp;