From 5ca96988b01c4c332a7e4a6dba40949c1766465f Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sat, 12 Jun 2010 15:46:56 +0000 Subject: [PATCH] declare a class with 'class' instead of struct to avoid tag mismatch warnings, and don't shift by a bool. Patch by Rizky Herucakra! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@105886 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Target/TargetInstrItineraries.h | 3 ++- utils/TableGen/NeonEmitter.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/llvm/Target/TargetInstrItineraries.h b/include/llvm/Target/TargetInstrItineraries.h index 3dfa8bc10bf..39648c233fa 100644 --- a/include/llvm/Target/TargetInstrItineraries.h +++ b/include/llvm/Target/TargetInstrItineraries.h @@ -106,7 +106,8 @@ struct InstrItinerary { /// Instruction itinerary Data - Itinerary data supplied by a subtarget to be /// used by a target. /// -struct InstrItineraryData { +class InstrItineraryData { +public: const InstrStage *Stages; ///< Array of stages selected const unsigned *OperandCycles; ///< Array of operand cycles selected const InstrItinerary *Itineratries; ///< Array of itineraries selected diff --git a/utils/TableGen/NeonEmitter.cpp b/utils/TableGen/NeonEmitter.cpp index 3c7a9fee007..6c5f86290da 100644 --- a/utils/TableGen/NeonEmitter.cpp +++ b/utils/TableGen/NeonEmitter.cpp @@ -669,7 +669,7 @@ static std::string GenBuiltin(const std::string &name, const std::string &proto, case 'h': nElts = 4; break; case 'f': nElts = 2; break; } - nElts <<= quad; + if (quad) nElts <<= 1; char arg = 'a'; std::string s;