Revert r147664; it's breaking clang regression tests.

llvm-svn: 147681
This commit is contained in:
Eli Friedman 2012-01-06 20:42:20 +00:00
parent d3dba31762
commit 48fd89ad14
6 changed files with 8 additions and 8 deletions

View File

@ -491,7 +491,7 @@ double FloatingLiteral::getValueAsApproximateDouble() const {
}
int StringLiteral::mapCharByteWidth(TargetInfo const &target,StringKind k) {
int CharByteWidth = 0;
int CharByteWidth;
switch(k) {
case Ascii:
case UTF8:

View File

@ -469,7 +469,7 @@ VisitAbstractConditionalOperator(const AbstractConditionalOperator *E) {
llvm::BasicBlock *ContBlock = CGF.createBasicBlock("cond.end");
// Bind the common expression if necessary.
CodeGenFunction::OpaqueValueMapping(CGF, E);
CodeGenFunction::OpaqueValueMapping binding(CGF, E);
CodeGenFunction::ConditionalEvaluation eval(CGF);
CGF.EmitBranchOnBoolExpr(E->getCond(), LHSBlock, RHSBlock);

View File

@ -680,7 +680,7 @@ VisitAbstractConditionalOperator(const AbstractConditionalOperator *E) {
llvm::BasicBlock *ContBlock = CGF.createBasicBlock("cond.end");
// Bind the common expression if necessary.
CodeGenFunction::OpaqueValueMapping(CGF, E);
CodeGenFunction::OpaqueValueMapping binding(CGF, E);
CodeGenFunction::ConditionalEvaluation eval(CGF);
CGF.EmitBranchOnBoolExpr(E->getCond(), LHSBlock, RHSBlock);

View File

@ -2483,7 +2483,7 @@ VisitAbstractConditionalOperator(const AbstractConditionalOperator *E) {
TestAndClearIgnoreResultAssign();
// Bind the common expression if necessary.
CodeGenFunction::OpaqueValueMapping(CGF, E);
CodeGenFunction::OpaqueValueMapping binding(CGF, E);
Expr *condExpr = E->getCond();
Expr *lhsExpr = E->getTrueExpr();

View File

@ -737,7 +737,7 @@ void Clang::AddMIPSTargetArgs(const ArgList &Args,
const Driver &D = getToolChain().getDriver();
StringRef ArchName;
const char *CPUName = 0;
const char *CPUName;
// Set target cpu and architecture.
if (Arg *A = Args.getLastArg(options::OPT_mcpu_EQ)) {

View File

@ -1226,7 +1226,7 @@ void ASTDeclReader::VisitRedeclarableTemplateDecl(RedeclarableTemplateDecl *D) {
RedeclKind Kind = (RedeclKind)Record[Idx++];
// Determine the first declaration ID.
DeclID FirstDeclID = 0;
DeclID FirstDeclID;
switch (Kind) {
case FirstDeclaration: {
FirstDeclID = ThisDeclID;
@ -1481,7 +1481,7 @@ ASTDeclReader::VisitRedeclarable(Redeclarable<T> *D) {
enum RedeclKind { FirstDeclaration = 0, FirstInFile, PointsToPrevious };
RedeclKind Kind = (RedeclKind)Record[Idx++];
DeclID FirstDeclID = 0;
DeclID FirstDeclID;
switch (Kind) {
case FirstDeclaration:
FirstDeclID = ThisDeclID;