[irstate] add addrspace to string literals

This is required for Vulkan support where these live in a different address space

Author: thewilsonator

gen/irstate.cpp

@@ -191,7 +191,11 @@ template <typename F>
 LLGlobalVariable *
 getCachedStringLiteralImpl(llvm::Module &module,
                            llvm::StringMap<LLGlobalVariable *> &cache,
-                           llvm::StringRef key, F initFactory) {
+                           llvm::StringRef key,
+#if LDC_LLVM_VER >= 1700
+                           std::optional< unsigned > addrspace,
+#endif
+                           F initFactory) {
   auto iter = cache.find(key);
   if (iter != cache.end()) {
     return iter->second;
@@ -201,7 +205,12 @@ getCachedStringLiteralImpl(llvm::Module &module,
 
   auto gvar =
       new LLGlobalVariable(module, constant->getType(), true,
-                           LLGlobalValue::PrivateLinkage, constant, ".str");
+                           LLGlobalValue::PrivateLinkage, constant,
+                           ".str", nullptr, llvm::GlobalValue::NotThreadLocal
+#if LDC_LLVM_VER >= 1700
+                           , addrspace
+#endif
+                           );
   gvar->setUnnamedAddr(LLGlobalValue::UnnamedAddr::Global);
 
   cache[key] = gvar;
@@ -241,14 +250,28 @@ LLGlobalVariable *IRState::getCachedStringLiteral(StringExp *se) {
   const llvm::StringRef key(reinterpret_cast<const char *>(keyData.ptr),
                             keyData.length);
 
-  return getCachedStringLiteralImpl(module, *cache, key, [se]() {
+  return getCachedStringLiteralImpl(module, *cache, key,
+#if LDC_LLVM_VER >= 1700
+                                    std::nullopt,
+#endif
+                                    [se]() {
     // null-terminate
     return buildStringLiteralConstant(se, se->len + 1);
   });
 }
 
-LLGlobalVariable *IRState::getCachedStringLiteral(llvm::StringRef s) {
-  return getCachedStringLiteralImpl(module, cachedStringLiterals, s, [&]() {
+LLGlobalVariable *IRState::getCachedStringLiteral(llvm::StringRef s
+#if LDC_LLVM_VER >= 1700
+                                                  ,std::optional< unsigned > addrspace
+#endif
+                                                  ) {
+  return getCachedStringLiteralImpl(module,
+                                    cachedStringLiterals,
+                                    s,
+#if LDC_LLVM_VER >= 1700
+                                    addrspace,
+#endif
+                                    [&]() {
     return llvm::ConstantDataArray::getString(context(), s, true);
   });
 }

gen/irstate.h

@@ -27,6 +27,7 @@
 #include <set>
 #include <sstream>
 #include <vector>
+#include <optional>
 
 namespace llvm {
 class LLVMContext;
@@ -248,7 +249,11 @@ struct IRState {
   // calls with a StringExp with matching data will return the same variable.
   // Exception: ulong[]-typed hex strings (not null-terminated either).
   llvm::GlobalVariable *getCachedStringLiteral(StringExp *se);
-  llvm::GlobalVariable *getCachedStringLiteral(llvm::StringRef s);
+  llvm::GlobalVariable *getCachedStringLiteral(llvm::StringRef s
+#if LDC_LLVM_VER >= 1600
+                                               ,std::optional< unsigned > = std::nullopt
+#endif
+                                               );
 
   // List of functions with cpu or features attributes overriden by user
   std::vector<IrFunction *> targetCpuOrFeaturesOverridden;