Commit 61c4ba94 authored by Bill Wendling's avatar Bill Wendling
Browse files

Merging r215618: 

------------------------------------------------------------------------
r215618 | majnemer | 2014-08-13 23:35:08 -0700 (Wed, 13 Aug 2014) | 7 lines

Parse: Don't attempt to act on #pragma init_seg when not targeting MSVC

It doesn't really make sense to try and do stuff with #pragma init_seg
when targeting non-Microsoft platforms; notions like library vs user
initializers don't exist for other targets.

This fixes PR20639.
------------------------------------------------------------------------

llvm-svn: 215880
parent 562712ae

clang/include/clang/Basic/DiagnosticParseKinds.td

+5 −0
Original line number Diff line number Diff line
@@ -849,6 +849,11 @@ def warn_pragma_pack_malformed : Warning< 
def warn_pragma_unused_expected_var : Warning<

  "expected '#pragma unused' argument to be a variable name">,

  InGroup<IgnoredPragmas>;

// - #pragma init_seg

def warn_pragma_init_seg_unsupported_target : Warning<

  "'#pragma init_seg' is only supported when targeting a "

  "Microsoft environment">,

  InGroup<IgnoredPragmas>;

// - #pragma fp_contract

def err_pragma_fp_contract_scope : Error<

  "'#pragma fp_contract' can only appear at file scope or at the start of a "

clang/lib/Parse/ParsePragma.cpp

+6 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
//===----------------------------------------------------------------------===//



#include "RAIIObjectsForParser.h"

#include "clang/Basic/TargetInfo.h"

#include "clang/Lex/Preprocessor.h"

#include "clang/Parse/ParseDiagnostic.h"

#include "clang/Parse/Parser.h"
@@ -655,6 +656,11 @@ bool Parser::HandlePragmaMSSegment(StringRef PragmaName, 
// #pragma init_seg({ compiler | lib | user | "section-name" [, func-name]} )

bool Parser::HandlePragmaMSInitSeg(StringRef PragmaName,

                                   SourceLocation PragmaLocation) {

  if (getTargetInfo().getTriple().getEnvironment() != llvm::Triple::MSVC) {

    PP.Diag(PragmaLocation, diag::warn_pragma_init_seg_unsupported_target);

    return false;

  }



  if (ExpectAndConsume(tok::l_paren, diag::warn_pragma_expected_lparen,

                       PragmaName))

    return false;

clang/test/SemaCXX/pragma-init_seg.cpp

+7 −1
Original line number Diff line number Diff line 
// RUN: %clang_cc1 -fsyntax-only -verify -fms-extensions %s -triple x86_64-pc-win32

// RUN: %clang_cc1 -fsyntax-only -verify -fms-extensions %s -triple i386-apple-darwin13.3.0



#ifndef __APPLE__

#pragma init_seg(L".my_seg") // expected-warning {{expected 'compiler', 'lib', 'user', or a string literal}}

#pragma init_seg( // expected-warning {{expected 'compiler', 'lib', 'user', or a string literal}}

#pragma init_seg asdf // expected-warning {{missing '('}}
@@ -10,6 +12,10 @@ 
#pragma init_seg("\x") // expected-error {{\x used with no following hex digits}}

#pragma init_seg("a" L"b") // expected-warning {{expected non-wide string literal in '#pragma init_seg'}}



int f();

#pragma init_seg(compiler)

#else

#pragma init_seg(compiler) // expected-warning {{'#pragma init_seg' is only supported when targeting a Microsoft environment}}

#endif



int f();

int __declspec(thread) x = f(); // expected-error {{initializer for thread-local variable must be a constant expression}}