summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCraig Topper <craig.topper@gmail.com>2013-07-17 00:31:35 +0000
committerCraig Topper <craig.topper@gmail.com>2013-07-17 00:31:35 +0000
commit8fc4096fabc88de41e49bf4226f9fc305d710137 (patch)
treeb476eea0065076ac51ae6f5d44988dda1df75543
parent3cf443ddd63fa219f3681ec3ca837cc1c0dc0829 (diff)
downloadbcm5719-llvm-8fc4096fabc88de41e49bf4226f9fc305d710137.tar.gz
bcm5719-llvm-8fc4096fabc88de41e49bf4226f9fc305d710137.zip
Move string pointer from being a static class member to just a static global in the one file its needed in.
llvm-svn: 186476
-rw-r--r--llvm/lib/Target/R600/AMDGPUMachineFunction.cpp7
-rw-r--r--llvm/lib/Target/R600/AMDGPUMachineFunction.h2
2 files changed, 2 insertions, 7 deletions
diff --git a/llvm/lib/Target/R600/AMDGPUMachineFunction.cpp b/llvm/lib/Target/R600/AMDGPUMachineFunction.cpp
index 9a1e3447e7e..f2342b0e885 100644
--- a/llvm/lib/Target/R600/AMDGPUMachineFunction.cpp
+++ b/llvm/lib/Target/R600/AMDGPUMachineFunction.cpp
@@ -2,10 +2,9 @@
#include "AMDGPU.h"
#include "llvm/IR/Attributes.h"
#include "llvm/IR/Function.h"
+using namespace llvm;
-namespace llvm {
-
-const char *AMDGPUMachineFunction::ShaderTypeAttribute = "ShaderType";
+static const char *const ShaderTypeAttribute = "ShaderType";
AMDGPUMachineFunction::AMDGPUMachineFunction(const MachineFunction &MF) :
MachineFunctionInfo() {
@@ -21,5 +20,3 @@ AMDGPUMachineFunction::AMDGPUMachineFunction(const MachineFunction &MF) :
llvm_unreachable("Can't parse shader type!");
}
}
-
-}
diff --git a/llvm/lib/Target/R600/AMDGPUMachineFunction.h b/llvm/lib/Target/R600/AMDGPUMachineFunction.h
index 5d5df1249b4..789b96a8fa0 100644
--- a/llvm/lib/Target/R600/AMDGPUMachineFunction.h
+++ b/llvm/lib/Target/R600/AMDGPUMachineFunction.h
@@ -18,8 +18,6 @@
namespace llvm {
class AMDGPUMachineFunction : public MachineFunctionInfo {
-private:
- static const char *ShaderTypeAttribute;
public:
AMDGPUMachineFunction(const MachineFunction &MF);
unsigned ShaderType;
OpenPOWER on IntegriCloud