Re: [Mesa-dev] [PATCH] st/clover: add space between < and ::

2017-04-19 Thread Nicolai Hähnle 

On 19.04.2017 13:05, Emil Velikov wrote:

From: Emil Velikov 

As pointed out by compiler

./llvm/codegen.hpp:52:22: error: ‘<::’ cannot begin a template-argument list 
[-fpermissive]
./llvm/codegen.hpp:52:22: note: ‘<:’ is an alternate spelling for ‘[’. Insert 
whitespace between ‘<’ and ‘::’

Cc: Francisco Jerez 
Cc: 
Signed-off-by: Emil Velikov 
---
Supersedes: HACK: st/clover: automake: set -fpermissive for clover/llvm

Commit message is a bit ... any suggestions will be appreciated.


I believe C++17 fixes that (the digraph, not the commit message, which 
is fine). Anyway,


Reviewed-by: Nicolai Hähnle 



---
 src/gallium/state_trackers/clover/llvm/codegen.hpp |  2 +-
 src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp |  4 ++--
 src/gallium/state_trackers/clover/llvm/codegen/common.cpp  |  6 +++---
 src/gallium/state_trackers/clover/llvm/codegen/native.cpp  |  2 +-
 src/gallium/state_trackers/clover/llvm/compat.hpp  |  8 
 src/gallium/state_trackers/clover/llvm/metadata.hpp| 12 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/gallium/state_trackers/clover/llvm/codegen.hpp 
b/src/gallium/state_trackers/clover/llvm/codegen.hpp
index 44971adb7dd..25f6e01beb5 100644
--- a/src/gallium/state_trackers/clover/llvm/codegen.hpp
+++ b/src/gallium/state_trackers/clover/llvm/codegen.hpp
@@ -49,7 +49,7 @@ namespace clover {
   build_module_library(const ::llvm::Module ,
enum module::section::type section_type);

-  std::unique_ptr<::llvm::Module>
+  std::unique_ptr< ::llvm::Module>
   parse_module_library(const module , ::llvm::LLVMContext ,
std::string _log);

diff --git a/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp 
b/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp
index d09207b946a..6737f7af0aa 100644
--- a/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp
+++ b/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp
@@ -94,7 +94,7 @@ clover::llvm::build_module_library(const ::llvm::Module ,
return m;
 }

-std::unique_ptr<::llvm::Module>
+std::unique_ptr< ::llvm::Module>
 clover::llvm::parse_module_library(const module , ::llvm::LLVMContext ,
std::string _log) {
auto mod = ::llvm::parseBitcodeFile(::llvm::MemoryBufferRef(
@@ -104,5 +104,5 @@ clover::llvm::parse_module_library(const module , 
::llvm::LLVMContext ,
  fail(r_log, error(CL_INVALID_PROGRAM), s);
   });

-   return std::unique_ptr<::llvm::Module>(std::move(*mod));
+   return std::unique_ptr< ::llvm::Module>(std::move(*mod));
 }
diff --git a/src/gallium/state_trackers/clover/llvm/codegen/common.cpp 
b/src/gallium/state_trackers/clover/llvm/codegen/common.cpp
index 3b0014d8797..075183400ae 100644
--- a/src/gallium/state_trackers/clover/llvm/codegen/common.cpp
+++ b/src/gallium/state_trackers/clover/llvm/codegen/common.cpp
@@ -121,12 +121,12 @@ namespace {
  } else {
 // Other types.
 const auto actual_type =
-   isa<::llvm::PointerType>(arg_type) && arg.hasByValAttr() ?
-   cast<::llvm::PointerType>(arg_type)->getElementType() : 
arg_type;
+   isa< ::llvm::PointerType>(arg_type) && arg.hasByValAttr() ?
+   cast< ::llvm::PointerType>(arg_type)->getElementType() : 
arg_type;

 if (actual_type->isPointerTy()) {
const unsigned address_space =
-  cast<::llvm::PointerType>(actual_type)->getAddressSpace();
+  cast< ::llvm::PointerType>(actual_type)->getAddressSpace();

if (address_space == address_spaces[clang::LangAS::opencl_local
- compat::lang_as_offset]) {
diff --git a/src/gallium/state_trackers/clover/llvm/codegen/native.cpp 
b/src/gallium/state_trackers/clover/llvm/codegen/native.cpp
index 4f24332f6b5..b9e67507192 100644
--- a/src/gallium/state_trackers/clover/llvm/codegen/native.cpp
+++ b/src/gallium/state_trackers/clover/llvm/codegen/native.cpp
@@ -156,7 +156,7 @@ clover::llvm::print_module_native(const ::llvm::Module ,
   const target ) {
std::string log;
try {
-  std::unique_ptr<::llvm::Module> cmod { CloneModule() };
+  std::unique_ptr< ::llvm::Module> cmod { CloneModule() };
   return as_string(emit_code(*cmod, target,
  TargetMachine::CGFT_AssemblyFile, log));
} catch (...) {
diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp 
b/src/gallium/state_trackers/clover/llvm/compat.hpp
index 987680cc3c0..cee51b9dd1b 100644
--- a/src/gallium/state_trackers/clover/llvm/compat.hpp
+++ b/src/gallium/state_trackers/clover/llvm/compat.hpp
@@ -132,18 +132,18 @@ namespace clover {

[Mesa-dev] [PATCH] st/clover: add space between < and ::

2017-04-19 Thread Emil Velikov 
From: Emil Velikov 

As pointed out by compiler

./llvm/codegen.hpp:52:22: error: ‘<::’ cannot begin a template-argument list 
[-fpermissive]
./llvm/codegen.hpp:52:22: note: ‘<:’ is an alternate spelling for ‘[’. Insert 
whitespace between ‘<’ and ‘::’

Cc: Francisco Jerez 
Cc: 
Signed-off-by: Emil Velikov 
---
Supersedes: HACK: st/clover: automake: set -fpermissive for clover/llvm

Commit message is a bit ... any suggestions will be appreciated.
---
 src/gallium/state_trackers/clover/llvm/codegen.hpp |  2 +-
 src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp |  4 ++--
 src/gallium/state_trackers/clover/llvm/codegen/common.cpp  |  6 +++---
 src/gallium/state_trackers/clover/llvm/codegen/native.cpp  |  2 +-
 src/gallium/state_trackers/clover/llvm/compat.hpp  |  8 
 src/gallium/state_trackers/clover/llvm/metadata.hpp| 12 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/gallium/state_trackers/clover/llvm/codegen.hpp 
b/src/gallium/state_trackers/clover/llvm/codegen.hpp
index 44971adb7dd..25f6e01beb5 100644
--- a/src/gallium/state_trackers/clover/llvm/codegen.hpp
+++ b/src/gallium/state_trackers/clover/llvm/codegen.hpp
@@ -49,7 +49,7 @@ namespace clover {
   build_module_library(const ::llvm::Module ,
enum module::section::type section_type);
 
-  std::unique_ptr<::llvm::Module>
+  std::unique_ptr< ::llvm::Module>
   parse_module_library(const module , ::llvm::LLVMContext ,
std::string _log);
 
diff --git a/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp 
b/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp
index d09207b946a..6737f7af0aa 100644
--- a/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp
+++ b/src/gallium/state_trackers/clover/llvm/codegen/bitcode.cpp
@@ -94,7 +94,7 @@ clover::llvm::build_module_library(const ::llvm::Module ,
return m;
 }
 
-std::unique_ptr<::llvm::Module>
+std::unique_ptr< ::llvm::Module>
 clover::llvm::parse_module_library(const module , ::llvm::LLVMContext ,
std::string _log) {
auto mod = ::llvm::parseBitcodeFile(::llvm::MemoryBufferRef(
@@ -104,5 +104,5 @@ clover::llvm::parse_module_library(const module , 
::llvm::LLVMContext ,
  fail(r_log, error(CL_INVALID_PROGRAM), s);
   });
 
-   return std::unique_ptr<::llvm::Module>(std::move(*mod));
+   return std::unique_ptr< ::llvm::Module>(std::move(*mod));
 }
diff --git a/src/gallium/state_trackers/clover/llvm/codegen/common.cpp 
b/src/gallium/state_trackers/clover/llvm/codegen/common.cpp
index 3b0014d8797..075183400ae 100644
--- a/src/gallium/state_trackers/clover/llvm/codegen/common.cpp
+++ b/src/gallium/state_trackers/clover/llvm/codegen/common.cpp
@@ -121,12 +121,12 @@ namespace {
  } else {
 // Other types.
 const auto actual_type =
-   isa<::llvm::PointerType>(arg_type) && arg.hasByValAttr() ?
-   cast<::llvm::PointerType>(arg_type)->getElementType() : 
arg_type;
+   isa< ::llvm::PointerType>(arg_type) && arg.hasByValAttr() ?
+   cast< ::llvm::PointerType>(arg_type)->getElementType() : 
arg_type;
 
 if (actual_type->isPointerTy()) {
const unsigned address_space =
-  cast<::llvm::PointerType>(actual_type)->getAddressSpace();
+  cast< ::llvm::PointerType>(actual_type)->getAddressSpace();
 
if (address_space == address_spaces[clang::LangAS::opencl_local
- compat::lang_as_offset]) {
diff --git a/src/gallium/state_trackers/clover/llvm/codegen/native.cpp 
b/src/gallium/state_trackers/clover/llvm/codegen/native.cpp
index 4f24332f6b5..b9e67507192 100644
--- a/src/gallium/state_trackers/clover/llvm/codegen/native.cpp
+++ b/src/gallium/state_trackers/clover/llvm/codegen/native.cpp
@@ -156,7 +156,7 @@ clover::llvm::print_module_native(const ::llvm::Module ,
   const target ) {
std::string log;
try {
-  std::unique_ptr<::llvm::Module> cmod { CloneModule() };
+  std::unique_ptr< ::llvm::Module> cmod { CloneModule() };
   return as_string(emit_code(*cmod, target,
  TargetMachine::CGFT_AssemblyFile, log));
} catch (...) {
diff --git a/src/gallium/state_trackers/clover/llvm/compat.hpp 
b/src/gallium/state_trackers/clover/llvm/compat.hpp
index 987680cc3c0..cee51b9dd1b 100644
--- a/src/gallium/state_trackers/clover/llvm/compat.hpp
+++ b/src/gallium/state_trackers/clover/llvm/compat.hpp
@@ -132,18 +132,18 @@ namespace clover {
 #endif
  }
 
- inline std::unique_ptr<::llvm::Linker>
+ inline std::unique_ptr< ::llvm::Linker>
  create_linker(::llvm::Module ) {
 #if HAVE_LLVM >= 0x0308
-