maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Rename the GCC Objective-C runtime to gcc from gnu-fragile and the GNUstep 

runtime to gnustep from gnu.  Fix EH for the GCC runtime.

llvm-svn: 159684
This commit is contained in:
David Chisnall 2012-07-03 20:49:52 +00:00
parent 1e148fe064
commit b601c96892
18 changed files with 63 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
clang/include/clang/Basic/ObjCRuntime.h
View File

@ -40,11 +40,12 @@ public:
/// version of iOS.
iOS,
/// 'gnu' is the non-fragile GNU runtime.
GNU,
/// 'gcc' is the Objective-C runtime shipped with GCC, implementing a
/// fragile Objective-C ABI
GCC,
/// 'gnu-fragile' is the fragile GNU runtime.
FragileGNU
/// 'gnustep' is the modern non-fragile GNUstep runtime.
GNUstep
};
private:
@ -71,9 +72,9 @@ public:
bool isNonFragile() const {
switch (getKind()) {
case FragileMacOSX: return false;
case FragileGNU: return false;
case GCC: return false;
case MacOSX: return true;
case GNU: return true;
case GNUstep: return true;
case iOS: return true;
}
llvm_unreachable("bad kind");
@ -83,15 +84,15 @@ public:
/// implied behaviors for a "fragile" ABI?
bool isFragile() const { return !isNonFragile(); }
/// \brief Is this runtime basically of the GNU family of runtimes?
/// \brief Is this runtime basically of the GNUstep family of runtimes?
bool isGNUFamily() const {
switch (getKind()) {
case FragileMacOSX:
case MacOSX:
case iOS:
return false;
case FragileGNU:
case GNU:
case GCC:
case GNUstep:
return true;
}
llvm_unreachable("bad kind");
@ -118,8 +119,8 @@ public:
// This is really a lie, because some implementations and versions
// of the runtime do not support ARC. Probably -fgnu-runtime
// should imply a "maximal" runtime or something?
case FragileGNU: return true;
case GNU: return true;
case GCC: return true;
case GNUstep: return true;
}
llvm_unreachable("bad kind");
}
@ -143,8 +144,8 @@ public:
// This is really a lie, because some implementations and versions
// of the runtime do not support ARC. Probably -fgnu-runtime
// should imply a "maximal" runtime or something?
case FragileGNU: return true;
case GNU: return true;
case GCC: return true;
case GNUstep: return true;
}
llvm_unreachable("bad kind");
}
@ -158,8 +159,8 @@ public:
case FragileMacOSX: return getVersion() >= VersionTuple(10, 8);
case MacOSX: return getVersion() >= VersionTuple(10, 8);
case iOS: return getVersion() >= VersionTuple(5);
case FragileGNU: return false;
case GNU: return false;
case GCC: return false;
case GNUstep: return false;
}
llvm_unreachable("bad kind");
}
@ -170,8 +171,19 @@ public:
case MacOSX: return true;
case iOS: return true;
case FragileMacOSX: return false;
case FragileGNU: return false;
case GNU: return false;
case GCC: return true;
case GNUstep: return true;
}
llvm_unreachable("bad kind");
}
/// \brief Does this runtime use zero-cost exceptions?
bool hasUnwindExceptions() const {
switch (getKind()) {
case MacOSX: return true;
case iOS: return true;
case FragileMacOSX: return false;
case GCC: return true;
case GNUstep: return true;
}
llvm_unreachable("bad kind");
}

12
clang/lib/Basic/ObjCRuntime.cpp
View File

@ -30,8 +30,8 @@ raw_ostream &clang::operator<<(raw_ostream &out, const ObjCRuntime &value) {
case ObjCRuntime::MacOSX: out << "macosx"; break;
case ObjCRuntime::FragileMacOSX: out << "macosx-fragile"; break;
case ObjCRuntime::iOS: out << "ios"; break;
case ObjCRuntime::GNU: out << "gnu"; break;
case ObjCRuntime::FragileGNU: out << "gnu-fragile"; break;
case ObjCRuntime::GNUstep: out << "gnustep"; break;
case ObjCRuntime::GCC: out << "gcc"; break;
}
if (value.getVersion() > VersionTuple(0)) {
out << '-' << value.getVersion();
@ -60,10 +60,10 @@ bool ObjCRuntime::tryParse(StringRef input) {
kind = ObjCRuntime::FragileMacOSX;
} else if (runtimeName == "ios") {
kind = ObjCRuntime::iOS;
} else if (runtimeName == "gnu") {
kind = ObjCRuntime::GNU;
} else if (runtimeName == "gnu-fragile") {
kind = ObjCRuntime::FragileGNU;
} else if (runtimeName == "gnustep") {
kind = ObjCRuntime::GNUstep;
} else if (runtimeName == "gcc") {
kind = ObjCRuntime::GCC;
} else {
return true;
}

11
clang/lib/CodeGen/CGException.cpp
View File

@ -186,8 +186,8 @@ static const EHPersonality &getObjCPersonality(const LangOptions &L) {
case ObjCRuntime::MacOSX:
case ObjCRuntime::iOS:
return EHPersonality::NeXT_ObjC;
case ObjCRuntime::GNU:
case ObjCRuntime::FragileGNU:
case ObjCRuntime::GNUstep:
case ObjCRuntime::GCC:
return EHPersonality::GNU_ObjC;
}
llvm_unreachable("bad runtime kind");
@ -216,10 +216,11 @@ static const EHPersonality &getObjCXXPersonality(const LangOptions &L) {
case ObjCRuntime::FragileMacOSX:
return getCXXPersonality(L);
// The GNU runtime's personality function inherently doesn't support
// The GCC runtime's personality function inherently doesn't support
// mixed EH. Use the C++ personality just to avoid returning null.
case ObjCRuntime::GNU:
case ObjCRuntime::FragileGNU:
case ObjCRuntime::GCC:
return EHPersonality::GNU_ObjC;
case ObjCRuntime::GNUstep:
return EHPersonality::GNU_ObjCXX;
}
llvm_unreachable("bad runtime kind");

4
clang/lib/CodeGen/CGObjCGNU.cpp
View File

@ -2666,10 +2666,10 @@ llvm::Value *CGObjCGNU::EmitIvarOffset(CodeGenFunction &CGF,
CGObjCRuntime *
clang::CodeGen::CreateGNUObjCRuntime(CodeGenModule &CGM) {
switch (CGM.getLangOpts().ObjCRuntime.getKind()) {
case ObjCRuntime::GNU:
case ObjCRuntime::GNUstep:
return new CGObjCGNUstep(CGM);
case ObjCRuntime::FragileGNU:
case ObjCRuntime::GCC:
return new CGObjCGCC(CGM);
case ObjCRuntime::FragileMacOSX:

4
clang/lib/CodeGen/CGObjCMac.cpp
View File

@ -6389,8 +6389,8 @@ CodeGen::CreateMacObjCRuntime(CodeGen::CodeGenModule &CGM) {
case ObjCRuntime::iOS:
return new CGObjCNonFragileABIMac(CGM);
case ObjCRuntime::GNU:
case ObjCRuntime::FragileGNU:
case ObjCRuntime::GNUstep:
case ObjCRuntime::GCC:
llvm_unreachable("these runtimes are not Mac runtimes");
}
llvm_unreachable("bad runtime");

6
clang/lib/CodeGen/CodeGenModule.cpp
View File

@ -138,8 +138,8 @@ void CodeGenModule::createObjCRuntime() {
// This is just isGNUFamily(), but we want to force implementors of
// new ABIs to decide how best to do this.
switch (LangOpts.ObjCRuntime.getKind()) {
case ObjCRuntime::GNU:
case ObjCRuntime::FragileGNU:
case ObjCRuntime::GNUstep:
case ObjCRuntime::GCC:
ObjCRuntime = CreateGNUObjCRuntime(*this);
return;
@ -546,7 +546,7 @@ static bool hasUnwindExceptions(const LangOptions &LangOpts) {
// If ObjC exceptions are enabled, this depends on the ABI.
if (LangOpts.ObjCExceptions) {
if (LangOpts.ObjCRuntime.isFragile()) return false;
return LangOpts.ObjCRuntime.hasUnwindExceptions();
}
return true;

2
clang/lib/Driver/ToolChain.cpp
View File

@ -50,7 +50,7 @@ bool ToolChain::HasNativeLLVMSupport() const {
}
ObjCRuntime ToolChain::getDefaultObjCRuntime(bool isNonFragile) const {
return ObjCRuntime(isNonFragile ? ObjCRuntime::GNU : ObjCRuntime::FragileGNU,
return ObjCRuntime(isNonFragile ? ObjCRuntime::GNUstep : ObjCRuntime::GCC,
VersionTuple());
}

2
clang/lib/Driver/Tools.cpp
View File

@ -2934,7 +2934,7 @@ ObjCRuntime Clang::AddObjCRuntimeArgs(const ArgList &args,
// -fgnu-runtime
} else {
assert(runtimeArg->getOption().matches(options::OPT_fgnu_runtime));
runtime = ObjCRuntime(ObjCRuntime::GNU, VersionTuple());
runtime = ObjCRuntime(ObjCRuntime::GCC, VersionTuple());
}
cmdArgs.push_back(args.MakeArgString(

2
clang/test/CodeGenObjC/bitfield-gnu.m
View File

@ -1,4 +1,4 @@
// RUN: %clang -S -emit-llvm -fobjc-runtime=gnu -o %t %s
// RUN: %clang -S -emit-llvm -fobjc-runtime=gcc -o %t %s
typedef enum { A1, A2 } A;
typedef struct { A a : 1; } B;
@interface Obj { B *b; } @end

2
clang/test/CodeGenObjC/bitfield_encoding.m
View File

@ -1,6 +1,6 @@
// RUN: %clang_cc1 -triple i386-unknown-unknown -fobjc-runtime=macosx-fragile-10.5 -emit-llvm -o %t %s
// RUN: grep "ib1b14" %t | count 1
// RUN: %clang_cc1 -triple i386-unknown-unknown -fobjc-runtime=macosx-fragile-10.5 -fobjc-runtime=gnu -emit-llvm -o %t %s
// RUN: %clang_cc1 -triple i386-unknown-unknown -fobjc-runtime=macosx-fragile-10.5 -fobjc-runtime=gcc -emit-llvm -o %t %s
// RUN: grep "ib32i1b33i14" %t | count 1
struct foo{

4
clang/test/CodeGenObjC/constant-strings.m
View File

@ -5,11 +5,11 @@
//
// CHECK-NEXT: @.str = {{.*}}constant [13 x i8] c"Hello World!\00", align 1
// RUN: %clang_cc1 -fobjc-runtime=gnu -emit-llvm -o %t %s
// RUN: %clang_cc1 -fobjc-runtime=gcc -emit-llvm -o %t %s
// RUN: FileCheck --check-prefix=CHECK-GNU < %t %s
// CHECK-GNU: NXConstantString
// RUN: %clang_cc1 -fobjc-runtime=gnu -fconstant-string-class NSConstantString -emit-llvm -o %t %s
// RUN: %clang_cc1 -fobjc-runtime=gcc -fconstant-string-class NSConstantString -emit-llvm -o %t %s
// RUN: FileCheck --check-prefix=CHECK-GNU-WITH-CLASS < %t %s
// CHECK-GNU-WITH-CLASS: NSConstantString
id a = @"Hello World!";

2
clang/test/CodeGenObjC/gnu-exceptions.m
View File

@ -1,4 +1,4 @@
// RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -emit-llvm -fexceptions -fobjc-exceptions -fobjc-runtime=gnu -o - %s | FileCheck %s
// RUN: %clang_cc1 -triple x86_64-pc-linux-gnu -emit-llvm -fexceptions -fobjc-exceptions -fobjc-runtime=gcc -o - %s | FileCheck %s
void opaque(void);
void log(int i);

4
clang/test/CodeGenObjC/messages.m
View File

@ -1,7 +1,7 @@
// RUN: %clang_cc1 -fobjc-runtime=macosx-fragile-10.5 -emit-llvm -o - %s | FileCheck %s -check-prefix=CHECK-MAC
// RUN: %clang_cc1 -emit-llvm -o - %s | FileCheck %s -check-prefix=CHECK-MAC-NF
// RUN: %clang_cc1 -fobjc-runtime=gnu-fragile -emit-llvm -o - %s | FileCheck %s -check-prefix=CHECK-GNU
// RUN: %clang_cc1 -fobjc-runtime=gnu -emit-llvm -o - %s | FileCheck %s -check-prefix CHECK-GNU-NF
// RUN: %clang_cc1 -fobjc-runtime=gcc -emit-llvm -o - %s | FileCheck %s -check-prefix=CHECK-GNU
// RUN: %clang_cc1 -fobjc-runtime=gnustep -emit-llvm -o - %s | FileCheck %s -check-prefix CHECK-GNU-NF
typedef struct {
int x;

2
clang/test/CodeGenObjC/undefined-protocol.m
View File

@ -1,4 +1,4 @@
// RUN: %clang_cc1 -emit-llvm-only -fobjc-runtime=gnu %s
// RUN: %clang_cc1 -emit-llvm-only -fobjc-runtime=gcc %s
@protocol MadeUpProtocol;

2
clang/test/Coverage/codegen-gnu.m
View File

@ -1,3 +1,3 @@
// RUN: %clang_cc1 -triple i386-unknown-unknown -fobjc-exceptions -fobjc-runtime=gnu -emit-llvm -o %t %s
// RUN: %clang_cc1 -triple i386-unknown-unknown -fobjc-exceptions -fobjc-runtime=gcc -emit-llvm -o %t %s
#include "objc-language-features.inc"

2
clang/test/Driver/gnu-runtime.m
View File

@ -1,4 +1,4 @@
// RUN: %clang -target i386-apple-darwin10 -### -fsyntax-only -fgnu-runtime %s 2>&1 | FileCheck %s
// RUN: %clang -target i386-apple-darwin10 -### -x objective-c++ -fsyntax-only -fgnu-runtime %s 2>&1 | FileCheck %s
// CHECK: -fobjc-runtime=gnu
// CHECK: -fobjc-runtime=gcc
// CHECK-NOT: fragile

4
clang/test/Preprocessor/init.c
View File

@ -85,7 +85,7 @@
// C94:#define __STDC_VERSION__ 199409L
//
//
// RUN: %clang_cc1 -fms-extensions -triple i686-pc-win32 -fobjc-runtime=gnu-fragile -E -dM < /dev/null | FileCheck -check-prefix MSEXT %s
// RUN: %clang_cc1 -fms-extensions -triple i686-pc-win32 -fobjc-runtime=gcc -E -dM < /dev/null | FileCheck -check-prefix MSEXT %s
//
// MSEXT-NOT:#define __STDC__
// MSEXT:#define _INTEGRAL_MAX_BITS 64
@ -1872,7 +1872,7 @@
// X86_64-LINUX:#define __x86_64 1
// X86_64-LINUX:#define __x86_64__ 1
//
// RUN: %clang_cc1 -x c++ -triple i686-pc-linux-gnu -fobjc-runtime=gnu-fragile -E -dM < /dev/null | FileCheck -check-prefix GNUSOURCE %s
// RUN: %clang_cc1 -x c++ -triple i686-pc-linux-gnu -fobjc-runtime=gcc -E -dM < /dev/null | FileCheck -check-prefix GNUSOURCE %s
// GNUSOURCE:#define _GNU_SOURCE 1
//
// RUN: %clang_cc1 -x c++ -std=c++98 -fno-rtti -E -dM < /dev/null | FileCheck -check-prefix NORTTI %s

2
clang/test/Preprocessor/non_fragile_feature1.m
View File

@ -1,4 +1,4 @@
// RUN: %clang_cc1 -triple i386-unknown-unknown -fobjc-runtime=gnu-fragile %s
// RUN: %clang_cc1 -triple i386-unknown-unknown -fobjc-runtime=gcc %s
#ifndef __has_feature
#error Should have __has_feature
#endif