From 3ef841dffbf386630fc874eb653b36f5ee193525 Mon Sep 17 00:00:00 2001
From: Maria Kotsifakou <kotsifa2@illinois.edu>
Date: Wed, 5 Nov 2014 14:25:29 +0000
Subject: [PATCH] Changed global address space to generic (removed from
cinflict resolution).
---
llvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/llvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp b/llvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
index 0883500362..7b487e6191 100644
--- a/llvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
+++ b/llvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
@@ -1035,7 +1035,7 @@ namespace {
int initialNumParams = F->arg_size();
- Type* ArgType = FRetTy->getPointerTo(GLOBAL_ADDRSPACE);
+ Type* ArgType = FRetTy->getPointerTo(GENERIC_ADDRSPACE);
new Argument(ArgType, "ret_struct_ptr", F);
DEBUG(errs() << "\tCreated parameter\n");
--
GitLab