diff options
| -rw-r--r-- | lib/AST/ASTDiagnostic.cpp | 2 | ||||
| -rw-r--r-- | test/Misc/diag-template-diffing.cpp | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/lib/AST/ASTDiagnostic.cpp b/lib/AST/ASTDiagnostic.cpp index 6fd07e1ef3..4b9ecdedd0 100644 --- a/lib/AST/ASTDiagnostic.cpp +++ b/lib/AST/ASTDiagnostic.cpp @@ -848,7 +848,7 @@ class TemplateDiff { dyn_cast<NonTypeTemplateParmDecl>(ParamND)) { Expr *FromExpr, *ToExpr; llvm::APSInt FromInt, ToInt; - unsigned ParamWidth = 0; + unsigned ParamWidth = 128; // Safe default if (DefaultNTTPD->getType()->isIntegralOrEnumerationType()) ParamWidth = Context.getIntWidth(DefaultNTTPD->getType()); bool HasFromInt = !FromIter.isEnd() && diff --git a/test/Misc/diag-template-diffing.cpp b/test/Misc/diag-template-diffing.cpp index e7a8048870..bb85a45d5d 100644 --- a/test/Misc/diag-template-diffing.cpp +++ b/test/Misc/diag-template-diffing.cpp @@ -812,6 +812,24 @@ namespace PR14489 { // CHECK-ELIDE-NOTREE: non-const lvalue reference to type 'VariableList<>' cannot bind to a temporary of type 'VariableList<>' } +namespace rdar12456626 { + struct IntWrapper { + typedef int type; + }; + + template<typename T, typename T::type V> + struct X { }; + + struct A { + virtual X<IntWrapper, 1> foo(); + }; + + struct B : A { + // CHECK-ELIDE-NOTREE: virtual function 'foo' has a different return type + virtual X<IntWrapper, 2> foo(); + }; +} + // CHECK-ELIDE-NOTREE: {{[0-9]*}} errors generated. // CHECK-NOELIDE-NOTREE: {{[0-9]*}} errors generated. // CHECK-ELIDE-TREE: {{[0-9]*}} errors generated. |