diff options
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Analysis/TargetLibraryInfo.cpp | 6 | ||||
| -rw-r--r-- | llvm/lib/IR/Verifier.cpp | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/llvm/lib/Analysis/TargetLibraryInfo.cpp b/llvm/lib/Analysis/TargetLibraryInfo.cpp index 7a07ab75264..2be5d5caf7c 100644 --- a/llvm/lib/Analysis/TargetLibraryInfo.cpp +++ b/llvm/lib/Analysis/TargetLibraryInfo.cpp @@ -1521,7 +1521,11 @@ TargetLibraryInfoImpl &TargetLibraryAnalysis::lookupInfoImpl(const Triple &T) { unsigned TargetLibraryInfoImpl::getTargetWCharSize(const Triple &T) { // See also clang/lib/Basic/Targets.cpp. - return T.isPS4() || T.isOSWindows() || T.getArch() == Triple::xcore ? 2 : 4; + if (T.isPS4() || T.isOSWindows() || T.isArch16Bit()) + return 2; + if (T.getArch() == Triple::xcore) + return 1; + return 4; } unsigned TargetLibraryInfoImpl::getWCharSize(const Module &M) const { diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp index 4b9bdcf81a3..21e8048442b 100644 --- a/llvm/lib/IR/Verifier.cpp +++ b/llvm/lib/IR/Verifier.cpp @@ -1322,9 +1322,6 @@ Verifier::visitModuleFlag(const MDNode *Op, ConstantInt *Value = mdconst::dyn_extract_or_null<ConstantInt>(Op->getOperand(2)); Assert(Value, "wchar_size metadata requires constant integer argument"); - uint64_t WCharSize = Value->getZExtValue(); - Assert(WCharSize == 0 || WCharSize == 2 || WCharSize == 4, - "wchar_size should be 0, 2 or 4"); } } |
