This is an archive of the discontinued LLVM Phabricator instance.

Differential D79525

[Sema] require -fcf-runtime-abi= for __NSConstantString
Needs ReviewPublic

Authored by nickdesaulniers on May 6 2020, 4:01 PM.

Details

Reviewers
compnerd
Summary

commit 81a650ee87eb ("Driver,CodeGen: introduce support for Swift CFString layout")
r345222

added support for implicit typedefs for __NSConstantString, used for
the runtime ABI for CoreFoundation, which can be set via -fcf-runtime-abi=.

This implicit typdef pollutes the global namespace for code that's not
targeting CoreFoundation platforms. As such, require -fcf-runtime-abi=
to be used, and disallow the creation of the typedef for C code that
does not specify.

This is most visable dumping ASTs when debugging.

Diff Detail

Event Timeline

nickdesaulniers created this revision.May 6 2020, 4:01 PM
Herald added a project: Restricted Project. · View Herald TranscriptMay 6 2020, 4:01 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B55988: Diff 262495.May 6 2020, 5:38 PM
nickdesaulniers added a comment.May 19 2020, 10:55 AM

clang::Codegen::DeferredDecls might be of interest here.

Revision Contents

Diff 262495

clang/lib/Sema/Sema.cpp

Show First 20 Lines • Show All 268 Lines • ▼ Show 20 Lines if (getLangOpts().ObjC) {
// Create the built-in forward declaratino for 'Protocol'. // Create the built-in forward declaratino for 'Protocol'.
DeclarationName Protocol = &Context.Idents.get("Protocol"); DeclarationName Protocol = &Context.Idents.get("Protocol");
if (IdResolver.begin(Protocol) == IdResolver.end()) if (IdResolver.begin(Protocol) == IdResolver.end())
PushOnScopeChains(Context.getObjCProtocolDecl(), TUScope); PushOnScopeChains(Context.getObjCProtocolDecl(), TUScope);
} }
// Create the internal type for the *StringMakeConstantString builtins. // Create the internal type for the *StringMakeConstantString builtins.
if (getLangOpts().ObjC ||
getLangOpts().CFRuntime != LangOptions::CoreFoundationABI::Unspecified) {
DeclarationName ConstantString = &Context.Idents.get("__NSConstantString"); DeclarationName ConstantString = &Context.Idents.get("__NSConstantString");
if (IdResolver.begin(ConstantString) == IdResolver.end()) if (IdResolver.begin(ConstantString) == IdResolver.end())
PushOnScopeChains(Context.getCFConstantStringDecl(), TUScope); PushOnScopeChains(Context.getCFConstantStringDecl(), TUScope);
}
// Initialize Microsoft "predefined C++ types". // Initialize Microsoft "predefined C++ types".
if (getLangOpts().MSVCCompat) { if (getLangOpts().MSVCCompat) {
if (getLangOpts().CPlusPlus && if (getLangOpts().CPlusPlus &&
IdResolver.begin(&Context.Idents.get("type_info")) == IdResolver.end()) IdResolver.begin(&Context.Idents.get("type_info")) == IdResolver.end())
PushOnScopeChains(Context.buildImplicitRecord("type_info", TTK_Class), PushOnScopeChains(Context.buildImplicitRecord("type_info", TTK_Class),
TUScope); TUScope);
▲ Show 20 Lines • Show All 2,132 Lines • Show Last 20 Lines

clang/test/AST/ast-dump-file-line-json.c

Show First 20 Lines • Show All 69 Lines • ▼ Show 20 Lines
// CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "id": "0x{{.*}}",
// CHECK-NEXT: "kind": "TypedefDecl", // CHECK-NEXT: "kind": "TypedefDecl",
// CHECK-NEXT: "loc": {}, // CHECK-NEXT: "loc": {},
// CHECK-NEXT: "range": { // CHECK-NEXT: "range": {
// CHECK-NEXT: "begin": {}, // CHECK-NEXT: "begin": {},
// CHECK-NEXT: "end": {} // CHECK-NEXT: "end": {}
// CHECK-NEXT: }, // CHECK-NEXT: },
// CHECK-NEXT: "isImplicit": true, // CHECK-NEXT: "isImplicit": true,
// CHECK-NEXT: "name": "__NSConstantString",
// CHECK-NEXT: "type": {
// CHECK-NEXT: "qualType": "struct __NSConstantString_tag"
// CHECK-NEXT: },
// CHECK-NEXT: "inner": [
// CHECK-NEXT: {
// CHECK-NEXT: "id": "0x{{.*}}",
// CHECK-NEXT: "kind": "RecordType",
// CHECK-NEXT: "type": {
// CHECK-NEXT: "qualType": "struct __NSConstantString_tag"
// CHECK-NEXT: },
// CHECK-NEXT: "decl": {
// CHECK-NEXT: "id": "0x{{.*}}",
// CHECK-NEXT: "kind": "RecordDecl",
// CHECK-NEXT: "name": "__NSConstantString_tag"
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "id": "0x{{.*}}",
// CHECK-NEXT: "kind": "TypedefDecl",
// CHECK-NEXT: "loc": {},
// CHECK-NEXT: "range": {
// CHECK-NEXT: "begin": {},
// CHECK-NEXT: "end": {}
// CHECK-NEXT: },
// CHECK-NEXT: "isImplicit": true,
// CHECK-NEXT: "name": "__builtin_ms_va_list", // CHECK-NEXT: "name": "__builtin_ms_va_list",
// CHECK-NEXT: "type": { // CHECK-NEXT: "type": {
// CHECK-NEXT: "qualType": "char *" // CHECK-NEXT: "qualType": "char *"
// CHECK-NEXT: }, // CHECK-NEXT: },
// CHECK-NEXT: "inner": [ // CHECK-NEXT: "inner": [
// CHECK-NEXT: { // CHECK-NEXT: {
// CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "id": "0x{{.*}}",
// CHECK-NEXT: "kind": "PointerType", // CHECK-NEXT: "kind": "PointerType",
▲ Show 20 Lines • Show All 196 Lines • Show Last 20 Lines

clang/test/AST/ast-dump-record-definition-data-json.cpp

Show First 20 Lines • Show All 123 Lines • ▼ Show 20 Linesstruct DoesNotAllowConstDefaultInit {
int i; int i;
}; };
// NOTE: CHECK lines have been autogenerated by gen_ast_dump_json_test.py // NOTE: CHECK lines have been autogenerated by gen_ast_dump_json_test.py
// using --filters=CXXRecordDecl // using --filters=CXXRecordDecl
// CHECK: "kind": "CXXRecordDecl", // CHECK: "kind": "CXXRecordDecl",
// CHECK-NEXT: "name": "__NSConstantString_tag"
// CHECK-NEXT: }
// CHECK: "kind": "CXXRecordDecl",
// CHECK-NEXT: "name": "__va_list_tag" // CHECK-NEXT: "name": "__va_list_tag"
// CHECK-NEXT: } // CHECK-NEXT: }
// CHECK: "kind": "CXXRecordDecl", // CHECK: "kind": "CXXRecordDecl",
// CHECK-NEXT: "loc": { // CHECK-NEXT: "loc": {
// CHECK-NEXT: "offset": 157, // CHECK-NEXT: "offset": 157,
// CHECK-NEXT: "col": 29, // CHECK-NEXT: "col": 29,
▲ Show 20 Lines • Show All 5,228 Lines • Show Last 20 Lines

clang/test/AST/ast-dump-records-json.cpp

Show First 20 Lines • Show All 83 Lines • ▼ Show 20 Lines
struct Derived6 : virtual public Bases... { struct Derived6 : virtual public Bases... {
}; };
// NOTE: CHECK lines have been autogenerated by gen_ast_dump_json_test.py // NOTE: CHECK lines have been autogenerated by gen_ast_dump_json_test.py
// using --filters=CXXRecordDecl // using --filters=CXXRecordDecl
// CHECK: "kind": "CXXRecordDecl", // CHECK: "kind": "CXXRecordDecl",
// CHECK-NEXT: "name": "__NSConstantString_tag"
// CHECK-NEXT: }
// CHECK: "kind": "CXXRecordDecl",
// CHECK-NEXT: "name": "__va_list_tag" // CHECK-NEXT: "name": "__va_list_tag"
// CHECK-NEXT: } // CHECK-NEXT: }
// CHECK: "kind": "CXXRecordDecl", // CHECK: "kind": "CXXRecordDecl",
// CHECK-NEXT: "loc": { // CHECK-NEXT: "loc": {
// CHECK-NEXT: "offset": 102, // CHECK-NEXT: "offset": 102,
// CHECK-NEXT: "file": "{{.*}}", // CHECK-NEXT: "file": "{{.*}}",
▲ Show 20 Lines • Show All 4,132 Lines • Show Last 20 Lines

clang/test/AST/ast-dump-template-decls-json.cpp

Show First 20 Lines • Show All 114 Lines • ▼ Show 20 Lines
// CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "id": "0x{{.*}}",
// CHECK-NEXT: "kind": "TypedefDecl", // CHECK-NEXT: "kind": "TypedefDecl",
// CHECK-NEXT: "loc": {}, // CHECK-NEXT: "loc": {},
// CHECK-NEXT: "range": { // CHECK-NEXT: "range": {
// CHECK-NEXT: "begin": {}, // CHECK-NEXT: "begin": {},
// CHECK-NEXT: "end": {} // CHECK-NEXT: "end": {}
// CHECK-NEXT: }, // CHECK-NEXT: },
// CHECK-NEXT: "isImplicit": true, // CHECK-NEXT: "isImplicit": true,
// CHECK-NEXT: "name": "__NSConstantString",
// CHECK-NEXT: "type": {
// CHECK-NEXT: "qualType": "__NSConstantString_tag"
// CHECK-NEXT: },
// CHECK-NEXT: "inner": [
// CHECK-NEXT: {
// CHECK-NEXT: "id": "0x{{.*}}",
// CHECK-NEXT: "kind": "RecordType",
// CHECK-NEXT: "type": {
// CHECK-NEXT: "qualType": "__NSConstantString_tag"
// CHECK-NEXT: },
// CHECK-NEXT: "decl": {
// CHECK-NEXT: "id": "0x{{.*}}",
// CHECK-NEXT: "kind": "CXXRecordDecl",
// CHECK-NEXT: "name": "__NSConstantString_tag"
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: },
// CHECK-NEXT: {
// CHECK-NEXT: "id": "0x{{.*}}",
// CHECK-NEXT: "kind": "TypedefDecl",
// CHECK-NEXT: "loc": {},
// CHECK-NEXT: "range": {
// CHECK-NEXT: "begin": {},
// CHECK-NEXT: "end": {}
// CHECK-NEXT: },
// CHECK-NEXT: "isImplicit": true,
// CHECK-NEXT: "name": "__builtin_ms_va_list", // CHECK-NEXT: "name": "__builtin_ms_va_list",
// CHECK-NEXT: "type": { // CHECK-NEXT: "type": {
// CHECK-NEXT: "qualType": "char *" // CHECK-NEXT: "qualType": "char *"
// CHECK-NEXT: }, // CHECK-NEXT: },
// CHECK-NEXT: "inner": [ // CHECK-NEXT: "inner": [
// CHECK-NEXT: { // CHECK-NEXT: {
// CHECK-NEXT: "id": "0x{{.*}}", // CHECK-NEXT: "id": "0x{{.*}}",
// CHECK-NEXT: "kind": "PointerType", // CHECK-NEXT: "kind": "PointerType",
▲ Show 20 Lines • Show All 2,348 Lines • Show Last 20 Lines

clang/test/CodeGen/cf-runtime-abi.c

// RUN: %clang_cc1 -triple x86_64-apple-macosx -S -emit-llvm -o - %s | FileCheck %s -check-prefix CHECK-OBJC
// RUN: %clang_cc1 -triple x86_64-unknown-windows-msvc -S -emit-llvm -o - %s | FileCheck %s -check-prefix CHECK-OBJC-LLP64
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -S -emit-llvm -o - %s | FileCheck %s -check-prefix CHECK-OBJC
// RUN: %clang_cc1 -triple x86_64-apple-macosx -fcf-runtime-abi=objc -S -emit-llvm -o - %s | FileCheck %s -check-prefix CHECK-OBJC // RUN: %clang_cc1 -triple x86_64-apple-macosx -fcf-runtime-abi=objc -S -emit-llvm -o - %s | FileCheck %s -check-prefix CHECK-OBJC
// RUN: %clang_cc1 -triple x86_64-unknown-windows-msvc -fcf-runtime-abi=objc -S -emit-llvm -o - %s | FileCheck %s -check-prefix CHECK-OBJC-LLP64 // RUN: %clang_cc1 -triple x86_64-unknown-windows-msvc -fcf-runtime-abi=objc -S -emit-llvm -o - %s | FileCheck %s -check-prefix CHECK-OBJC-LLP64
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fcf-runtime-abi=objc -S -emit-llvm -o - %s | FileCheck %s -check-prefix CHECK-OBJC // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fcf-runtime-abi=objc -S -emit-llvm -o - %s | FileCheck %s -check-prefix CHECK-OBJC
// RUN: %clang_cc1 -triple x86_64-apple-macosx -fcf-runtime-abi=standalone -S -emit-llvm -o - %s | FileCheck %s -check-prefix CHECK-OBJC // RUN: %clang_cc1 -triple x86_64-apple-macosx -fcf-runtime-abi=standalone -S -emit-llvm -o - %s | FileCheck %s -check-prefix CHECK-OBJC
// RUN: %clang_cc1 -triple x86_64-unknown-windows-msvc -fcf-runtime-abi=standalone -S -emit-llvm -o - %s | FileCheck %s -check-prefix CHECK-OBJC-LLP64 // RUN: %clang_cc1 -triple x86_64-unknown-windows-msvc -fcf-runtime-abi=standalone -S -emit-llvm -o - %s | FileCheck %s -check-prefix CHECK-OBJC-LLP64
// RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fcf-runtime-abi=standalone -S -emit-llvm -o - %s | FileCheck %s -check-prefix CHECK-OBJC // RUN: %clang_cc1 -triple x86_64-unknown-linux-gnu -fcf-runtime-abi=standalone -S -emit-llvm -o - %s | FileCheck %s -check-prefix CHECK-OBJC
▲ Show 20 Lines • Show All 54 Lines • Show Last 20 Lines