diff options
| -rw-r--r-- | clang/lib/CodeGen/CGBuiltin.cpp | 12 | ||||
| -rw-r--r-- | clang/lib/Sema/SemaType.cpp | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp index 10493d396d0..787ac5361bb 100644 --- a/clang/lib/CodeGen/CGBuiltin.cpp +++ b/clang/lib/CodeGen/CGBuiltin.cpp @@ -2236,10 +2236,10 @@ enum { namespace { struct NeonIntrinsicInfo { + const char *NameHint; unsigned BuiltinID; unsigned LLVMIntrinsic; unsigned AltLLVMIntrinsic; - const char *NameHint; unsigned TypeModifier; bool operator<(unsigned RHSBuiltinID) const { @@ -2252,16 +2252,16 @@ struct NeonIntrinsicInfo { } // end anonymous namespace #define NEONMAP0(NameBase) \ - { NEON::BI__builtin_neon_ ## NameBase, 0, 0, #NameBase, 0 } + { #NameBase, NEON::BI__builtin_neon_ ## NameBase, 0, 0, 0 } #define NEONMAP1(NameBase, LLVMIntrinsic, TypeModifier) \ - { NEON:: BI__builtin_neon_ ## NameBase, \ - Intrinsic::LLVMIntrinsic, 0, #NameBase, TypeModifier } + { #NameBase, NEON:: BI__builtin_neon_ ## NameBase, \ + Intrinsic::LLVMIntrinsic, 0, TypeModifier } #define NEONMAP2(NameBase, LLVMIntrinsic, AltLLVMIntrinsic, TypeModifier) \ - { NEON:: BI__builtin_neon_ ## NameBase, \ + { #NameBase, NEON:: BI__builtin_neon_ ## NameBase, \ Intrinsic::LLVMIntrinsic, Intrinsic::AltLLVMIntrinsic, \ - #NameBase, TypeModifier } + TypeModifier } static const NeonIntrinsicInfo ARMSIMDIntrinsicMap [] = { NEONMAP2(vabd_v, arm_neon_vabdu, arm_neon_vabds, Add1ArgType | UnsignedAlts), diff --git a/clang/lib/Sema/SemaType.cpp b/clang/lib/Sema/SemaType.cpp index 0c22287d4b4..388d258488b 100644 --- a/clang/lib/Sema/SemaType.cpp +++ b/clang/lib/Sema/SemaType.cpp @@ -2458,14 +2458,14 @@ void Sema::diagnoseIgnoredQualifiers(unsigned DiagID, unsigned Quals, return; struct Qual { - unsigned Mask; const char *Name; + unsigned Mask; SourceLocation Loc; } const QualKinds[4] = { - { DeclSpec::TQ_const, "const", ConstQualLoc }, - { DeclSpec::TQ_volatile, "volatile", VolatileQualLoc }, - { DeclSpec::TQ_restrict, "restrict", RestrictQualLoc }, - { DeclSpec::TQ_atomic, "_Atomic", AtomicQualLoc } + { "const", DeclSpec::TQ_const, ConstQualLoc }, + { "volatile", DeclSpec::TQ_volatile, VolatileQualLoc }, + { "restrict", DeclSpec::TQ_restrict, RestrictQualLoc }, + { "_Atomic", DeclSpec::TQ_atomic, AtomicQualLoc } }; SmallString<32> QualStr; |
