intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-26 03:56:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tighten up handling of __func__ and friends: it should be an array

Browse Source 
of const char, and it should error if it occurs outside a function.

Is it valid in an objc method?  If so we should handle that too.

llvm-svn: 45910
This commit is contained in:
Chris Lattner
2008-01-12 18:39:25 +00:00
parent 0009c44464
commit 317e6ba07f
3 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
clang/Sema/SemaExpr.cpp
View File

@@ -115,25 +115,23 @@ Sema::ExprResult Sema::ActOnPreDefinedExpr(SourceLocation Loc,
PreDefinedExpr::IdentType IT;
switch (Kind) {
default:
assert(0 && "Unknown simple primary expr!");
case tok::kw___func__: // primary-expression: __func__ [C99 6.4.2.2]
IT = PreDefinedExpr::Func;
break;
case tok::kw___FUNCTION__: // primary-expression: __FUNCTION__ [GNU]
IT = PreDefinedExpr::Function;
break;
case tok::kw___PRETTY_FUNCTION__: // primary-expression: __P..Y_F..N__ [GNU]
IT = PreDefinedExpr::PrettyFunction;
break;
default: assert(0 && "Unknown simple primary expr!");
case tok::kw___func__: IT = PreDefinedExpr::Func; break; // [C99 6.4.2.2]
case tok::kw___FUNCTION__: IT = PreDefinedExpr::Function; break;
case tok::kw___PRETTY_FUNCTION__: IT = PreDefinedExpr::PrettyFunction; break;
}
// Verify that this is in a function context.
if (CurFunctionDecl == 0)
return Diag(Loc, diag::err_predef_outside_function);
// Pre-defined identifiers are of type char[x], where x is the length of the
// string.
llvm::APSInt Length(32);
Length = CurFunctionDecl->getIdentifier()->getLength() + 1;
QualType ResTy = Context.getConstantArrayType(Context.CharTy, Length,
ArrayType::Normal, 0);
QualType ResTy = Context.CharTy.getQualifiedType(QualType::Const);
ResTy = Context.getConstantArrayType(ResTy, Length, ArrayType::Normal, 0);
return new PreDefinedExpr(Loc, ResTy, IT);
}

3
clang/include/clang/Basic/DiagnosticKinds.def
View File

@@ -501,6 +501,9 @@ DIAG(warn_octal_escape_too_large, WARNING,
DIAG(err_hex_escape_no_digits, ERROR,
"\\x used with no following hex digits")
DIAG(err_predef_outside_function, ERROR,
"predefined identifier is only valid inside function")
// Declarations.
DIAG(err_typename_requires_specqual, ERROR,

11
clang/test/Sema/predef.c
View File

@@ -1,7 +1,12 @@
// RUN: clang -fsyntax-only %s
// RUN: clang -fsyntax-only -verify %s
int abcdefghi12(void) {
void abcdefghi12(void) {
const char (*ss)[12] = &__func__;
return sizeof(__func__);
static int arr[sizeof(__func__)==12 ? 1 : -1];
}
char *X = __func__; // expected-error {{predefined identifier is only valid}}
void a() {
__func__[0] = 'a'; // expected-error {{variable is not assignable}}
}