adamcz created this revision.
adamcz added a reviewer: hokein.
adamcz requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
When working with invalid code, we would try to dereference a nullptr
while deducing template arguments in some dependend code operating on a
lambda with invalid return type.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D95145
Files:
clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
clang/test/SemaCXX/subst-func-type-invalid-ret-type.cpp
Index: clang/test/SemaCXX/subst-func-type-invalid-ret-type.cpp
===================================================================
--- /dev/null
+++ clang/test/SemaCXX/subst-func-type-invalid-ret-type.cpp
@@ -0,0 +1,13 @@
+// RUN: %clang -fsyntax-only -std=c++17 %s -Xclang -verify
+#include <type_traits>
+
+template <typename T>
+auto Call(T x) -> typename std::result_of<T(int)>::type {} //
expected-note{{candidate template ignored}}
+
+class Status {};
+
+void fun() {
+ // The Status() (instead of Status) here used to cause a crash.
+ Call([](auto x) -> Status() {}); // expected-error{{function cannot return
function type 'Status ()}}
+ // expected-error@-1{{no matching function for call to 'Call'}}
+}
Index: clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
===================================================================
--- clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -4189,6 +4189,9 @@
for (unsigned OldIdx = 0, NumOldParams = OldProtoLoc.getNumParams();
OldIdx != NumOldParams; ++OldIdx) {
ParmVarDecl *OldParam = OldProtoLoc.getParam(OldIdx);
+ if (!OldParam)
+ return nullptr;
+
LocalInstantiationScope *Scope = SemaRef.CurrentInstantiationScope;
Optional<unsigned> NumArgumentsInExpansion;
Index: clang/test/SemaCXX/subst-func-type-invalid-ret-type.cpp
===================================================================
--- /dev/null
+++ clang/test/SemaCXX/subst-func-type-invalid-ret-type.cpp
@@ -0,0 +1,13 @@
+// RUN: %clang -fsyntax-only -std=c++17 %s -Xclang -verify
+#include <type_traits>
+
+template <typename T>
+auto Call(T x) -> typename std::result_of<T(int)>::type {} // expected-note{{candidate template ignored}}
+
+class Status {};
+
+void fun() {
+ // The Status() (instead of Status) here used to cause a crash.
+ Call([](auto x) -> Status() {}); // expected-error{{function cannot return function type 'Status ()}}
+ // expected-error@-1{{no matching function for call to 'Call'}}
+}
Index: clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
===================================================================
--- clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -4189,6 +4189,9 @@
for (unsigned OldIdx = 0, NumOldParams = OldProtoLoc.getNumParams();
OldIdx != NumOldParams; ++OldIdx) {
ParmVarDecl *OldParam = OldProtoLoc.getParam(OldIdx);
+ if (!OldParam)
+ return nullptr;
+
LocalInstantiationScope *Scope = SemaRef.CurrentInstantiationScope;
Optional<unsigned> NumArgumentsInExpansion;
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
