r205037 - Use constexpr again, this time portably

[Duncan P. N. Exon Smith]

On Apr 10, 2014, at 16:55, Richard Smith <richard at metafoo.co.uk> wrote:

> On Fri, Mar 28, 2014 at 12:27 PM, Duncan P. N. Exon Smith <dexonsmith at apple.com> wrote:
> Author: dexonsmith
> Date: Fri Mar 28 14:27:37 2014
> New Revision: 205037
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=205037&view=rev
> Log:
> Use constexpr again, this time portably
> 
> Responding to Justin's review of r205025.
> 
> Modified:
>     cfe/trunk/lib/CodeGen/CodeGenPGO.cpp
> 
> Modified: cfe/trunk/lib/CodeGen/CodeGenPGO.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenPGO.cpp?rev=205037&r1=205036&r2=205037&view=diff
> ==============================================================================
> --- cfe/trunk/lib/CodeGen/CodeGenPGO.cpp (original)
> +++ cfe/trunk/lib/CodeGen/CodeGenPGO.cpp Fri Mar 28 14:27:37 2014
> @@ -815,8 +815,8 @@ namespace {
>  }
> 
>  static void emitRuntimeHook(CodeGenModule &CGM) {
> -  const char *RuntimeVarName = "__llvm_profile_runtime";
> -  const char *RuntimeUserName = "__llvm_profile_runtime_user";
> +  LLVM_CONSTEXPR const char *RuntimeVarName = "__llvm_profile_runtime";
> +  LLVM_CONSTEXPR const char *RuntimeUserName = "__llvm_profile_runtime_user";
> 
> constexpr seems like overkill here. I think what you really want is just
> 
>   const char *const RuntimeBlah = "...";
> 
> (that'll do the right thing regardless of constexpr support).
r206008