Author: hans
Date: Tue Jan 17 18:24:13 2017
New Revision: 292313
URL: http://llvm.org/viewvc/llvm-project?rev=292313&view=rev
Log:
Merging r292052:
------------------------------------------------------------------------
r292052 | akirtzidis | 2017-01-14 22:11:04 -0800 (Sat, 14 Jan 2017) | 1 line
[code-completion] Fix crash when trying to do postfix completion of instance
member inside a static function.
------------------------------------------------------------------------
Modified:
cfe/branches/release_40/ (props changed)
cfe/branches/release_40/lib/Parse/ParseExpr.cpp
cfe/branches/release_40/test/CodeCompletion/member-access.cpp
Propchange: cfe/branches/release_40/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 17 18:24:13 2017
@@ -1,4 +1,4 @@
/cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:291850,291853,291865,291871,291877,291879,291881,291907,291964,292032,292265
+/cfe/trunk:291850,291853,291865,291871,291877,291879,291881,291907,291964,292032,292052,292265
/cfe/trunk/test:170344
/cfe/trunk/test/SemaTemplate:126920
Modified: cfe/branches/release_40/lib/Parse/ParseExpr.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/lib/Parse/ParseExpr.cpp?rev=292313&r1=292312&r2=292313&view=diff
==============================================================================
--- cfe/branches/release_40/lib/Parse/ParseExpr.cpp (original)
+++ cfe/branches/release_40/lib/Parse/ParseExpr.cpp Tue Jan 17 18:24:13 2017
@@ -1652,9 +1652,10 @@ Parser::ParsePostfixExpressionSuffix(Exp
if (Tok.is(tok::code_completion)) {
// Code completion for a member access expression.
- Actions.CodeCompleteMemberReferenceExpr(
- getCurScope(), LHS.get(), OpLoc, OpKind == tok::arrow,
- ExprStatementTokLoc == LHS.get()->getLocStart());
+ if (Expr *Base = LHS.get())
+ Actions.CodeCompleteMemberReferenceExpr(
+ getCurScope(), Base, OpLoc, OpKind == tok::arrow,
+ ExprStatementTokLoc == Base->getLocStart());
cutOffParsing();
return ExprError();
Modified: cfe/branches/release_40/test/CodeCompletion/member-access.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/test/CodeCompletion/member-access.cpp?rev=292313&r1=292312&r2=292313&view=diff
==============================================================================
--- cfe/branches/release_40/test/CodeCompletion/member-access.cpp (original)
+++ cfe/branches/release_40/test/CodeCompletion/member-access.cpp Tue Jan 17
18:24:13 2017
@@ -27,6 +27,16 @@ public:
void test(const Proxy &p) {
p->
+}
+
+struct Test1 {
+ Base1 b;
+
+ static void sfunc() {
+ b. // expected-error {{invalid use of member 'b' in static member
function}}
+ }
+};
+
// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:29:6 %s -o - |
FileCheck -check-prefix=CHECK-CC1 %s
// CHECK-CC1: Base1 : Base1::
// CHECK-CC1: member1 : [#int#][#Base1::#]member1
@@ -39,4 +49,6 @@ void test(const Proxy &p) {
// CHECK-CC1: memfun1 (Hidden) : [#void#]Base2::memfun1(<#int#>)
// CHECK-CC1: memfun2 : [#void#][#Base3::#]memfun2(<#int#>)
// CHECK-CC1: memfun3 : [#int#]memfun3(<#int#>)
-
+
+// Make sure this doesn't crash
+// RUN: %clang_cc1 -fsyntax-only -code-completion-at=%s:36:7 %s -verify
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
