Fixed compilation problem on Windows (initialization of non-aggregate type).

After commit 217131.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@217134 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Elena Demikhovsky 2014-09-04 07:20:39 +00:00
parent b4f4dd4439
commit a91600713d

View File

@ -24,10 +24,6 @@ enum IntrinsicType {
}; };
struct IntrinsicData { struct IntrinsicData {
IntrinsicData(unsigned IId, IntrinsicType IType, unsigned IOpc0, unsigned IOpc1)
:Id(IId), Type(IType), Opc0(IOpc0), Opc1(IOpc1) {}
IntrinsicData(unsigned IId)
:Id(IId), Type(INTR_NO_TYPE) {}
unsigned Id; unsigned Id;
IntrinsicType Type; IntrinsicType Type;
@ -111,7 +107,7 @@ static const IntrinsicData IntrinsicsWithChain[] = {
*/ */
static const IntrinsicData* getIntrinsicWithChain(unsigned IntNo) { static const IntrinsicData* getIntrinsicWithChain(unsigned IntNo) {
IntrinsicData IntrinsicToFind(IntNo); IntrinsicData IntrinsicToFind = {IntNo, INTR_NO_TYPE, 0, 0 };
const IntrinsicData *Data = std::lower_bound(std::begin(IntrinsicsWithChain), const IntrinsicData *Data = std::lower_bound(std::begin(IntrinsicsWithChain),
std::end(IntrinsicsWithChain), std::end(IntrinsicsWithChain),
IntrinsicToFind); IntrinsicToFind);
@ -241,7 +237,7 @@ static const IntrinsicData IntrinsicsWithoutChain[] = {
* Return nullptr if intrinsic is not defined in the table. * Return nullptr if intrinsic is not defined in the table.
*/ */
static const IntrinsicData* getIntrinsicWithoutChain(unsigned IntNo) { static const IntrinsicData* getIntrinsicWithoutChain(unsigned IntNo) {
IntrinsicData IntrinsicToFind(IntNo); IntrinsicData IntrinsicToFind = { IntNo, INTR_NO_TYPE, 0, 0 };
const IntrinsicData *Data = std::lower_bound(std::begin(IntrinsicsWithoutChain), const IntrinsicData *Data = std::lower_bound(std::begin(IntrinsicsWithoutChain),
std::end(IntrinsicsWithoutChain), std::end(IntrinsicsWithoutChain),
IntrinsicToFind); IntrinsicToFind);