diff options
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp | 4 | ||||
| -rw-r--r-- | llvm/lib/CodeGen/Spiller.h | 2 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/X86Subtarget.cpp | 8 | 
3 files changed, 5 insertions, 9 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp index 85ade6fc715..87ca13e2860 100644 --- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -3905,11 +3905,11 @@ SDValue SelectionDAG::getNode(unsigned Opcode, DebugLoc DL, SDVTList VTList,    if (VTList.NumVTs == 1)      return getNode(Opcode, DL, VTList.VTs[0], Ops, NumOps); +#if 0    switch (Opcode) {    // FIXME: figure out how to safely handle things like    // int foo(int x) { return 1 << (x & 255); }    // int bar() { return foo(256); } -#if 0    case ISD::SRA_PARTS:    case ISD::SRL_PARTS:    case ISD::SHL_PARTS: @@ -3925,8 +3925,8 @@ SDValue SelectionDAG::getNode(unsigned Opcode, DebugLoc DL, SDVTList VTList,            return getNode(Opcode, DL, VT, N1, N2, N3.getOperand(0));        }      break; -#endif    } +#endif    // Memoize the node unless it returns a flag.    SDNode *N; diff --git a/llvm/lib/CodeGen/Spiller.h b/llvm/lib/CodeGen/Spiller.h index f339336f61c..9c3900df0b5 100644 --- a/llvm/lib/CodeGen/Spiller.h +++ b/llvm/lib/CodeGen/Spiller.h @@ -14,7 +14,7 @@  namespace llvm { -  struct LiveInterval; +  class LiveInterval;    class LiveIntervals;    class LiveStacks;    class MachineFunction; diff --git a/llvm/lib/Target/X86/X86Subtarget.cpp b/llvm/lib/Target/X86/X86Subtarget.cpp index 678139addc2..733f02ff069 100644 --- a/llvm/lib/Target/X86/X86Subtarget.cpp +++ b/llvm/lib/Target/X86/X86Subtarget.cpp @@ -365,9 +365,7 @@ static const char *GetCurrentX86CPU() {          }        case 15:          if (HasSSE3) { -          switch (Model) { -          default: return "k8-sse3"; -          } +          return "k8-sse3";          } else {            switch (Model) {            case 1:  return "opteron"; @@ -376,9 +374,7 @@ static const char *GetCurrentX86CPU() {            }          }        case 16: -        switch (Model) { -        default: return "amdfam10"; -        } +        return "amdfam10";      default:        return "generic";      }  | 

