[PATCH] D38106: TargetLibraryInfo: Stop guessing the wchar_t size

[Matthias Braun via Phabricator via llvm-commits]

MatzeB created this revision.
Herald added a subscriber: mcrosier.

Usually the frontend communicates the size of wchar_t via metadata and
we can optimize wcslen (and possibly other calls in the future). In
cases without the wchar_size metadata we would previously try to guess
the correct size based on the target triple; however this is fragile to
keep up to date and may miss users manually changing the size via flags.
Better be safe and stop guessing and optimizing if the frontend didn't
communicate the size.


Repository:
  rL LLVM

https://reviews.llvm.org/D38106

Files:
  include/llvm/Analysis/TargetLibraryInfo.h
  lib/Analysis/TargetLibraryInfo.cpp
  lib/Transforms/Utils/SimplifyLibCalls.cpp
  test/Transforms/InstCombine/wcslen-1.ll
  test/Transforms/InstCombine/wcslen-2.ll


Index: test/Transforms/InstCombine/wcslen-2.ll
===================================================================
--- test/Transforms/InstCombine/wcslen-2.ll
+++ test/Transforms/InstCombine/wcslen-2.ll
@@ -4,6 +4,9 @@
 
 target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
 
+!0 = !{i32 1, !"wchar_size", i32 4}
+!llvm.module.flags = !{!0}
+
 @hello = constant [6 x i32] [i32 104, i32 101, i32 108, i32 108, i32 111, i32 0]
 
 declare i64 @wcslen(i32*, i32)
Index: test/Transforms/InstCombine/wcslen-1.ll
===================================================================
--- test/Transforms/InstCombine/wcslen-1.ll
+++ test/Transforms/InstCombine/wcslen-1.ll
@@ -7,6 +7,9 @@
 
 declare i64 @wcslen(i32*)
 
+!0 = !{i32 1, !"wchar_size", i32 4}
+!llvm.module.flags = !{!0}
+
 @hello = constant [6 x i32] [i32 104, i32 101, i32 108, i32 108, i32 111, i32 0]
 @longer = constant [7 x i32] [i32 108, i32 111, i32 110, i32 103, i32 101, i32 114, i32 0]
 @null = constant [1 x i32] zeroinitializer
Index: lib/Transforms/Utils/SimplifyLibCalls.cpp
===================================================================
--- lib/Transforms/Utils/SimplifyLibCalls.cpp
+++ lib/Transforms/Utils/SimplifyLibCalls.cpp
@@ -508,6 +508,9 @@
 Value *LibCallSimplifier::optimizeWcslen(CallInst *CI, IRBuilder<> &B) {
   Module &M = *CI->getParent()->getParent()->getParent();
   unsigned WCharSize = TLI->getWCharSize(M) * 8;
+  // We cannot perform this optimization without wchar_size metadata.
+  if (WCharSize == 0)
+    return nullptr;
 
   return optimizeStringLength(CI, B, WCharSize);
 }
Index: lib/Analysis/TargetLibraryInfo.cpp
===================================================================
--- lib/Analysis/TargetLibraryInfo.cpp
+++ lib/Analysis/TargetLibraryInfo.cpp
@@ -1519,20 +1519,11 @@
   return *Impl;
 }
 
-unsigned TargetLibraryInfoImpl::getTargetWCharSize(const Triple &T) {
-  // See also clang/lib/Basic/Targets.cpp.
-  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 {
   if (auto *ShortWChar = cast_or_null<ConstantAsMetadata>(
       M.getModuleFlag("wchar_size")))
     return cast<ConstantInt>(ShortWChar->getValue())->getZExtValue();
-  return getTargetWCharSize(Triple(M.getTargetTriple()));
+  return 0;
 }
 
 TargetLibraryInfoWrapperPass::TargetLibraryInfoWrapperPass()
Index: include/llvm/Analysis/TargetLibraryInfo.h
===================================================================
--- include/llvm/Analysis/TargetLibraryInfo.h
+++ include/llvm/Analysis/TargetLibraryInfo.h
@@ -193,13 +193,9 @@
     ShouldSignExtI32Param = Val;
   }
 
-  /// Returns the size of the wchar_t type in bytes.
+  /// Returns the size of the wchar_t type in bytes or 0 if the size is unknown.
+  /// This queries the 'wchar_size' metadata.
   unsigned getWCharSize(const Module &M) const;
-
-  /// Returns size of the default wchar_t type on target \p T. This is mostly
-  /// intended to verify that the size in the frontend matches LLVM. All other
-  /// queries should use getWCharSize() instead.
-  static unsigned getTargetWCharSize(const Triple &T);
 };
 
 /// Provides information about what library functions are available for


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D38106.116104.patch
Type: text/x-patch
Size: 3303 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170920/ee4bbbfd/attachment.bin>