summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2012-02-02 19:35:29 +0000
committerBenjamin Kramer <benny.kra@googlemail.com>2012-02-02 19:35:29 +0000
commitb6d6508b1651bf19c8d8467f1c86e45854148ca3 (patch)
tree2cb72d3411865d2d0328f0d68c80c31130a73ea0
parent9f93dc75825cf95af8e8ae2d457d3f872d887f06 (diff)
downloadbcm5719-llvm-b6d6508b1651bf19c8d8467f1c86e45854148ca3.tar.gz
bcm5719-llvm-b6d6508b1651bf19c8d8467f1c86e45854148ca3.zip
Initialize the user defined conversion function to null if this is an aggregate initialization from an initializer list.
Found by valgrind. llvm-svn: 149627
-rw-r--r--clang/lib/Sema/SemaOverload.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaOverload.cpp b/clang/lib/Sema/SemaOverload.cpp
index d09fd9dad2e..98212454b84 100644
--- a/clang/lib/Sema/SemaOverload.cpp
+++ b/clang/lib/Sema/SemaOverload.cpp
@@ -4185,6 +4185,7 @@ TryListConversion(Sema &S, InitListExpr *From, QualType ToType,
Result.UserDefined.After.setAsIdentityConversion();
Result.UserDefined.After.setFromType(ToType);
Result.UserDefined.After.setAllToTypes(ToType);
+ Result.UserDefined.ConversionFunction = 0;
}
return Result;
}
OpenPOWER on IntegriCloud