Check that the clobber registers are valid.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@44311 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Basic/TargetInfo.cpp b/Basic/TargetInfo.cpp
index 57b01b7..3b20d3a 100644
--- a/Basic/TargetInfo.cpp
+++ b/Basic/TargetInfo.cpp
@@ -14,8 +14,9 @@
#include "clang/Basic/TargetInfo.h"
#include "clang/Basic/Diagnostic.h"
#include "clang/AST/Builtins.h"
-#include "llvm/ADT/StringMap.h"
#include "llvm/ADT/APFloat.h"
+#include "llvm/ADT/StringMap.h"
+#include "llvm/ADT/STLExtras.h"
#include <set>
using namespace clang;
@@ -270,6 +271,46 @@
/// is a valid register name according to GCC. This is used by Sema for
/// inline asm statements.
bool TargetInfo::isValidGCCRegisterName(const char *Name) const {
- // FIXME: Implement this.
+ const char * const *Names;
+ unsigned NumNames;
+
+ // Get rid of any register prefix.
+ if (Name[0] == '%' || Name[0] == '#')
+ Name++;
+
+ if (strcmp(Name, "memory") == 0 ||
+ strcmp(Name, "cc") == 0)
+ return true;
+
+ PrimaryTarget->getGCCRegNames(Names, NumNames);
+
+ // If we have a number it maps to an entry in the register name array.
+ if (isdigit(Name[0])) {
+ char *End;
+ int n = (int)strtol(Name, &End, 0);
+ if (*End == 0)
+ return n >= 0 && (unsigned)n < NumNames;
+ }
+
+ // Check register names.
+ for (unsigned i = 0; i < NumNames; i++) {
+ if (strcmp(Name, Names[i]) == 0)
+ return true;
+ }
+
+ // Now check aliases.
+ const TargetInfoImpl::GCCRegAlias *Aliases;
+ unsigned NumAliases;
+
+ PrimaryTarget->getGCCRegAliases(Aliases, NumAliases);
+ for (unsigned i = 0; i < NumAliases; i++) {
+ for (unsigned j = 0 ; j < llvm::array_lengthof(Aliases[i].Aliases); j++) {
+ if (!Aliases[i].Aliases[j])
+ break;
+ if (strcmp(Aliases[i].Aliases[j], Name) == 0)
+ return true;
+ }
+ }
+
return false;
}
diff --git a/Sema/SemaStmt.cpp b/Sema/SemaStmt.cpp
index d99356e..7f5d038 100644
--- a/Sema/SemaStmt.cpp
+++ b/Sema/SemaStmt.cpp
@@ -16,8 +16,10 @@
#include "clang/AST/Expr.h"
#include "clang/AST/Stmt.h"
#include "clang/Parse/Scope.h"
+#include "clang/Basic/TargetInfo.h"
#include "clang/Basic/Diagnostic.h"
#include "clang/Basic/LangOptions.h"
+#include "llvm/ADT/SmallString.h"
using namespace clang;
Sema::StmtResult Sema::ActOnExprStmt(ExprTy *expr) {
@@ -691,6 +693,25 @@
}
}
+ // Check that the clobbers are valid.
+ for (unsigned i = 0; i < NumClobbers; i++) {
+ StringLiteral *Literal = cast<StringLiteral>((Expr *)Clobbers[i]);
+ assert(!Literal->isWide() && "Clobber strings should not be wide!");
+
+ llvm::SmallString<16> Clobber(Literal->getStrData(),
+ Literal->getStrData() +
+ Literal->getByteLength());
+
+ if (!Context.Target.isValidGCCRegisterName(Clobber.c_str())) {
+ Diag(Literal->getLocStart(),
+ diag::err_unknown_register_name_in_asm,
+ Clobber.c_str());
+
+ // FIXME: We currently leak memory here.
+ return true;
+ }
+ }
+
return new AsmStmt(AsmLoc,
IsVolatile,
NumOutputs,
diff --git a/include/clang/Basic/DiagnosticKinds.def b/include/clang/Basic/DiagnosticKinds.def
index 31fdd27..ffdf626 100644
--- a/include/clang/Basic/DiagnosticKinds.def
+++ b/include/clang/Basic/DiagnosticKinds.def
@@ -793,7 +793,9 @@
"invalid lvalue in asm output")
DIAG(err_invalid_type_in_asm_input, ERROR,
"invalid type '%0' in asm input")
-
+DIAG(err_unknown_register_name_in_asm, ERROR,
+ "unknown register name '%0' in asm")
+
// CHECK: printf format string errors
DIAG(warn_printf_not_string_constant, WARNING,
"format string is not a string literal (potentially insecure)")
diff --git a/include/clang/Basic/TargetInfo.h b/include/clang/Basic/TargetInfo.h
index c4c2631..3a186a2 100644
--- a/include/clang/Basic/TargetInfo.h
+++ b/include/clang/Basic/TargetInfo.h
@@ -278,7 +278,7 @@
}
virtual void getGCCRegNames(const char * const *&Names,
- unsigned &NumNames) const = 0;
+ unsigned &NumNames) const = 0;
struct GCCRegAlias {
const char * const Aliases[5];
diff --git a/test/Sema/asm.c b/test/Sema/asm.c
index e01a0f2..360af01 100644
--- a/test/Sema/asm.c
+++ b/test/Sema/asm.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -verify -fsyntax-only
+// RUN: clang %s -arch=i386 -verify -fsyntax-only
void
f()
@@ -12,3 +12,16 @@
asm ("foo\n" : "=a" (i + 2)); // expected-error {{invalid lvalue in asm output}}
}
+
+void
+clobbers()
+{
+ asm ("nop" : : : "ax", "#ax", "%ax");
+ asm ("nop" : : : "eax", "rax", "ah", "al");
+ asm ("nop" : : : "0", "%0", "#0");
+ asm ("nop" : : : "foo"); // expected-error {{unknown register name 'foo' in asm}}
+ asm ("nop" : : : "52");
+ asm ("nop" : : : "53"); // expected-error {{unknown register name '53' in asm}}
+ asm ("nop" : : : "-1"); // expected-error {{unknown register name '-1' in asm}}
+ asm ("nop" : : : "+1"); // expected-error {{unknown register name '+1' in asm}}
+}