This is an archive of the discontinued LLVM Phabricator instance.

Differential D8010

Do not parse members of incomplete class.
ClosedPublic

Authored by sepavloff on Mar 2 2015, 9:54 AM.

Details

Reviewers
rsmith
Commits
rG47ebb75cf9f5: Do not parse members of incomplete class.
rC239483: Do not parse members of incomplete class.
rL239483: Do not parse members of incomplete class.
Summary

If definition of a class is unknown and out-of-line definition of its
member is encountered, do not parse the member declaration.
This change fixes PR18542.

Diff Detail

Event Timeline

sepavloff updated this revision to Diff 21015.Mar 2 2015, 9:54 AM
sepavloff retitled this revision from to Do not parse members of incomplete class..
sepavloff updated this object.
sepavloff edited the test plan for this revision. (Show Details)
sepavloff added a subscriber: Unknown Object (MLST).
sepavloff added a comment.Mar 12 2015, 10:30 AM

Any feedback?

Thanks,
--Serge

2015-03-02 23:54 GMT+06:00 Serge Pavlov <sepavloff@gmail.com>:

If definition of a class is unknown and out-of-line definition of its
member is encountered, do not parse the member declaration.
This change fixes PR18542.

http://reviews.llvm.org/D8010

Files:

lib/Sema/SemaDecl.cpp
test/SemaCXX/incomplete-call.cpp

Index: lib/Sema/SemaDecl.cpp

  • lib/Sema/SemaDecl.cpp

+++ lib/Sema/SemaDecl.cpp
@@ -4573,12 +4573,14 @@

  RequireCompleteDeclContext(D.getCXXScopeSpec(), DC))
return nullptr;

+ // If a class is incomplete, do not parse entities inside it.

if (isa<CXXRecordDecl>(DC) &&

!cast<CXXRecordDecl>(DC)->hasDefinition()) {

Diag(D.getIdentifierLoc(),
     diag::err_member_def_undefined_record)
  << Name << DC << D.getCXXScopeSpec().getRange();
  • D.setInvalidType();
  • } else if (!D.getDeclSpec().isFriendSpecified()) {

+ return nullptr;
+ }
+ if (!D.getDeclSpec().isFriendSpecified()) {

if (diagnoseQualifiedDeclaration(D.getCXXScopeSpec(), DC,
                                Name, D.getIdentifierLoc())) {
  if (DC->isRecord())

Index: test/SemaCXX/incomplete-call.cpp

  • test/SemaCXX/incomplete-call.cpp

+++ test/SemaCXX/incomplete-call.cpp
@@ -47,3 +47,15 @@
void test_incomplete_object_call(C& c) {

c(); // expected-error{{incomplete type in call to object of type}}

}
+
+namespace pr18542 {
+ struct X {
+ int count;
+ template<typename CharT> class basic_istream;
+ template<typename CharT>
+ void basic_istream<CharT>::read() { // expected-error{{out-of-line
definition of 'read' from class 'basic_istream<CharT>' without definition}}
+ count = 0;
+ }
+ };
+}
+

EMAIL PREFERENCES

http://reviews.llvm.org/settings/panel/emailpreferences/
sepavloff added a comment.Mar 18 2015, 9:23 PM

Ping.

Thanks,
--Serge

2015-03-12 23:30 GMT+06:00 Serge Pavlov <sepavloff@gmail.com>:

Any feedback?

Thanks,
--Serge

2015-03-02 23:54 GMT+06:00 Serge Pavlov <sepavloff@gmail.com>:

If definition of a class is unknown and out-of-line definition of its
member is encountered, do not parse the member declaration.
This change fixes PR18542.

http://reviews.llvm.org/D8010

Files:

lib/Sema/SemaDecl.cpp
test/SemaCXX/incomplete-call.cpp

Index: lib/Sema/SemaDecl.cpp

  • lib/Sema/SemaDecl.cpp

+++ lib/Sema/SemaDecl.cpp
@@ -4573,12 +4573,14 @@

  RequireCompleteDeclContext(D.getCXXScopeSpec(), DC))
return nullptr;

+ // If a class is incomplete, do not parse entities inside it.

if (isa<CXXRecordDecl>(DC) &&

!cast<CXXRecordDecl>(DC)->hasDefinition()) {

Diag(D.getIdentifierLoc(),
     diag::err_member_def_undefined_record)
  << Name << DC << D.getCXXScopeSpec().getRange();
  • D.setInvalidType();
  • } else if (!D.getDeclSpec().isFriendSpecified()) {

+ return nullptr;
+ }
+ if (!D.getDeclSpec().isFriendSpecified()) {

if (diagnoseQualifiedDeclaration(D.getCXXScopeSpec(), DC,
                                Name, D.getIdentifierLoc())) {
  if (DC->isRecord())

Index: test/SemaCXX/incomplete-call.cpp

  • test/SemaCXX/incomplete-call.cpp

+++ test/SemaCXX/incomplete-call.cpp
@@ -47,3 +47,15 @@
void test_incomplete_object_call(C& c) {

c(); // expected-error{{incomplete type in call to object of type}}

}
+
+namespace pr18542 {
+ struct X {
+ int count;
+ template<typename CharT> class basic_istream;
+ template<typename CharT>
+ void basic_istream<CharT>::read() { // expected-error{{out-of-line
definition of 'read' from class 'basic_istream<CharT>' without definition}}
+ count = 0;
+ }
+ };
+}
+

EMAIL PREFERENCES

http://reviews.llvm.org/settings/panel/emailpreferences/
sepavloff added a comment.Apr 15 2015, 11:52 AM

Ping.

Thanks,
--Serge

2015-03-19 10:22 GMT+06:00 Serge Pavlov <sepavloff@gmail.com>:

Ping.

Thanks,
--Serge

2015-03-12 23:30 GMT+06:00 Serge Pavlov <sepavloff@gmail.com>:

Any feedback?

Thanks,
--Serge

2015-03-02 23:54 GMT+06:00 Serge Pavlov <sepavloff@gmail.com>:

If definition of a class is unknown and out-of-line definition of its
member is encountered, do not parse the member declaration.
This change fixes PR18542.

http://reviews.llvm.org/D8010

Files:

lib/Sema/SemaDecl.cpp
test/SemaCXX/incomplete-call.cpp

Index: lib/Sema/SemaDecl.cpp

  • lib/Sema/SemaDecl.cpp

+++ lib/Sema/SemaDecl.cpp
@@ -4573,12 +4573,14 @@

  RequireCompleteDeclContext(D.getCXXScopeSpec(), DC))
return nullptr;

+ // If a class is incomplete, do not parse entities inside it.

if (isa<CXXRecordDecl>(DC) &&

!cast<CXXRecordDecl>(DC)->hasDefinition()) {

Diag(D.getIdentifierLoc(),
     diag::err_member_def_undefined_record)
  << Name << DC << D.getCXXScopeSpec().getRange();
  • D.setInvalidType();
  • } else if (!D.getDeclSpec().isFriendSpecified()) {

+ return nullptr;
+ }
+ if (!D.getDeclSpec().isFriendSpecified()) {

if (diagnoseQualifiedDeclaration(D.getCXXScopeSpec(), DC,
                                Name, D.getIdentifierLoc())) {
  if (DC->isRecord())

Index: test/SemaCXX/incomplete-call.cpp

  • test/SemaCXX/incomplete-call.cpp

+++ test/SemaCXX/incomplete-call.cpp
@@ -47,3 +47,15 @@
void test_incomplete_object_call(C& c) {

c(); // expected-error{{incomplete type in call to object of type}}

}
+
+namespace pr18542 {
+ struct X {
+ int count;
+ template<typename CharT> class basic_istream;
+ template<typename CharT>
+ void basic_istream<CharT>::read() { //
expected-error{{out-of-line definition of 'read' from class
'basic_istream<CharT>' without definition}}
+ count = 0;
+ }
+ };
+}
+

EMAIL PREFERENCES

http://reviews.llvm.org/settings/panel/emailpreferences/
sepavloff added a comment.May 25 2015, 5:15 AM

Any feedback?

Thanks,
--Serge

2015-04-16 0:52 GMT+06:00 Serge Pavlov <sepavloff@gmail.com>:

Ping.

Thanks,
--Serge

2015-03-19 10:22 GMT+06:00 Serge Pavlov <sepavloff@gmail.com>:

Ping.

Thanks,
--Serge

2015-03-12 23:30 GMT+06:00 Serge Pavlov <sepavloff@gmail.com>:

Any feedback?

Thanks,
--Serge

2015-03-02 23:54 GMT+06:00 Serge Pavlov <sepavloff@gmail.com>:

If definition of a class is unknown and out-of-line definition of its
member is encountered, do not parse the member declaration.
This change fixes PR18542.

http://reviews.llvm.org/D8010

Files:

lib/Sema/SemaDecl.cpp
test/SemaCXX/incomplete-call.cpp

Index: lib/Sema/SemaDecl.cpp

  • lib/Sema/SemaDecl.cpp

+++ lib/Sema/SemaDecl.cpp
@@ -4573,12 +4573,14 @@

  RequireCompleteDeclContext(D.getCXXScopeSpec(), DC))
return nullptr;

+ // If a class is incomplete, do not parse entities inside it.

if (isa<CXXRecordDecl>(DC) &&

!cast<CXXRecordDecl>(DC)->hasDefinition()) {

Diag(D.getIdentifierLoc(),
     diag::err_member_def_undefined_record)
  << Name << DC << D.getCXXScopeSpec().getRange();
  • D.setInvalidType();
  • } else if (!D.getDeclSpec().isFriendSpecified()) {

+ return nullptr;
+ }
+ if (!D.getDeclSpec().isFriendSpecified()) {

if (diagnoseQualifiedDeclaration(D.getCXXScopeSpec(), DC,
                                Name, D.getIdentifierLoc())) {
  if (DC->isRecord())

Index: test/SemaCXX/incomplete-call.cpp

  • test/SemaCXX/incomplete-call.cpp

+++ test/SemaCXX/incomplete-call.cpp
@@ -47,3 +47,15 @@
void test_incomplete_object_call(C& c) {

c(); // expected-error{{incomplete type in call to object of type}}

}
+
+namespace pr18542 {
+ struct X {
+ int count;
+ template<typename CharT> class basic_istream;
+ template<typename CharT>
+ void basic_istream<CharT>::read() { //
expected-error{{out-of-line definition of 'read' from class
'basic_istream<CharT>' without definition}}
+ count = 0;
+ }
+ };
+}
+

EMAIL PREFERENCES

http://reviews.llvm.org/settings/panel/emailpreferences/
sepavloff added a comment.Jun 3 2015, 10:47 PM

Ping!

Thanks,
--Serge

2015-05-25 18:15 GMT+06:00 Serge Pavlov <sepavloff@gmail.com>:

Any feedback?

Thanks,
--Serge

2015-04-16 0:52 GMT+06:00 Serge Pavlov <sepavloff@gmail.com>:

Ping.

Thanks,
--Serge

2015-03-19 10:22 GMT+06:00 Serge Pavlov <sepavloff@gmail.com>:

Ping.

Thanks,
--Serge

2015-03-12 23:30 GMT+06:00 Serge Pavlov <sepavloff@gmail.com>:

Any feedback?

Thanks,
--Serge

2015-03-02 23:54 GMT+06:00 Serge Pavlov <sepavloff@gmail.com>:

If definition of a class is unknown and out-of-line definition of its
member is encountered, do not parse the member declaration.
This change fixes PR18542.

http://reviews.llvm.org/D8010

Files:

lib/Sema/SemaDecl.cpp
test/SemaCXX/incomplete-call.cpp

Index: lib/Sema/SemaDecl.cpp

  • lib/Sema/SemaDecl.cpp

+++ lib/Sema/SemaDecl.cpp
@@ -4573,12 +4573,14 @@

  RequireCompleteDeclContext(D.getCXXScopeSpec(), DC))
return nullptr;

+ // If a class is incomplete, do not parse entities inside it.

if (isa<CXXRecordDecl>(DC) &&

!cast<CXXRecordDecl>(DC)->hasDefinition()) {

Diag(D.getIdentifierLoc(),
     diag::err_member_def_undefined_record)
  << Name << DC << D.getCXXScopeSpec().getRange();
  • D.setInvalidType();
  • } else if (!D.getDeclSpec().isFriendSpecified()) {

+ return nullptr;
+ }
+ if (!D.getDeclSpec().isFriendSpecified()) {

if (diagnoseQualifiedDeclaration(D.getCXXScopeSpec(), DC,
                                Name, D.getIdentifierLoc())) {
  if (DC->isRecord())

Index: test/SemaCXX/incomplete-call.cpp

  • test/SemaCXX/incomplete-call.cpp

+++ test/SemaCXX/incomplete-call.cpp
@@ -47,3 +47,15 @@
void test_incomplete_object_call(C& c) {

c(); // expected-error{{incomplete type in call to object of type}}

}
+
+namespace pr18542 {
+ struct X {
+ int count;
+ template<typename CharT> class basic_istream;
+ template<typename CharT>
+ void basic_istream<CharT>::read() { //
expected-error{{out-of-line definition of 'read' from class
'basic_istream<CharT>' without definition}}
+ count = 0;
+ }
+ };
+}
+

EMAIL PREFERENCES

http://reviews.llvm.org/settings/panel/emailpreferences/
rsmith accepted this revision.Jun 9 2015, 2:05 PM
rsmith added a reviewer: rsmith.
rsmith added a subscriber: rsmith.

LGTM

This revision is now accepted and ready to land.Jun 9 2015, 2:05 PM
Closed by commit rL239483: Do not parse members of incomplete class. (authored by sepavloff). · Explain WhyJun 10 2015, 12:11 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
Sema/
6 lines
test/
SemaCXX/
12 lines

Diff 21015

lib/Sema/SemaDecl.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 4,567 Lines • ▼ Show 20 Lines if (!DC || isa<EnumDecl>(DC)) {
return nullptr; return nullptr;
} }
bool IsDependentContext = DC->isDependentContext(); bool IsDependentContext = DC->isDependentContext();
if (!IsDependentContext && if (!IsDependentContext &&
RequireCompleteDeclContext(D.getCXXScopeSpec(), DC)) RequireCompleteDeclContext(D.getCXXScopeSpec(), DC))
return nullptr; return nullptr;
// If a class is incomplete, do not parse entities inside it.
if (isa<CXXRecordDecl>(DC) && !cast<CXXRecordDecl>(DC)->hasDefinition()) { if (isa<CXXRecordDecl>(DC) && !cast<CXXRecordDecl>(DC)->hasDefinition()) {
Diag(D.getIdentifierLoc(), Diag(D.getIdentifierLoc(),
diag::err_member_def_undefined_record) diag::err_member_def_undefined_record)
<< Name << DC << D.getCXXScopeSpec().getRange(); << Name << DC << D.getCXXScopeSpec().getRange();
D.setInvalidType(); return nullptr;
} else if (!D.getDeclSpec().isFriendSpecified()) { }
if (!D.getDeclSpec().isFriendSpecified()) {
if (diagnoseQualifiedDeclaration(D.getCXXScopeSpec(), DC, if (diagnoseQualifiedDeclaration(D.getCXXScopeSpec(), DC,
Name, D.getIdentifierLoc())) { Name, D.getIdentifierLoc())) {
if (DC->isRecord()) if (DC->isRecord())
return nullptr; return nullptr;
D.setInvalidType(); D.setInvalidType();
} }
} }
▲ Show 20 Lines • Show All 9,478 Lines • Show Last 20 Lines

test/SemaCXX/incomplete-call.cpp

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Lines
} }
struct C; // expected-note{{forward declaration}} struct C; // expected-note{{forward declaration}}
void test_incomplete_object_call(C& c) { void test_incomplete_object_call(C& c) {
c(); // expected-error{{incomplete type in call to object of type}} c(); // expected-error{{incomplete type in call to object of type}}
} }
namespace pr18542 {
struct X {
int count;
template<typename CharT> class basic_istream;
template<typename CharT>
void basic_istream<CharT>::read() { // expected-error{{out-of-line definition of 'read' from class 'basic_istream<CharT>' without definition}}
count = 0;
}
};
}