[llvm] r213777 - AsmParser: remove deprecated LLIR support

[Rafael Avila de Espindola]

Thanks

Sent from my iPhone

> On Jul 23, 2014, at 14:09, Saleem Abdulrasool <compnerd at compnerd.org> wrote:
> 
> Author: compnerd
> Date: Wed Jul 23 13:09:31 2014
> New Revision: 213777
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=213777&view=rev
> Log:
> AsmParser: remove deprecated LLIR support
> 
> linker_private and linker_private_weak were deprecated in 3.5.  Remove support
> for them now that the 3.5 branch has been created.
> 
> Removed:
>    llvm/trunk/test/Bitcode/deprecated-linker_private-linker_private_weak.ll
> Modified:
>    llvm/trunk/lib/AsmParser/LLLexer.cpp
>    llvm/trunk/lib/AsmParser/LLParser.cpp
>    llvm/trunk/lib/AsmParser/LLToken.h
> 
> Modified: llvm/trunk/lib/AsmParser/LLLexer.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLLexer.cpp?rev=213777&r1=213776&r2=213777&view=diff
> ==============================================================================
> --- llvm/trunk/lib/AsmParser/LLLexer.cpp (original)
> +++ llvm/trunk/lib/AsmParser/LLLexer.cpp Wed Jul 23 13:09:31 2014
> @@ -516,8 +516,6 @@ lltok::Kind LLLexer::LexIdentifier() {
> 
>   KEYWORD(private);
>   KEYWORD(internal);
> -  KEYWORD(linker_private);        // NOTE: deprecated, for parser compatibility
> -  KEYWORD(linker_private_weak);   // NOTE: deprecated, for parser compatibility
>   KEYWORD(available_externally);
>   KEYWORD(linkonce);
>   KEYWORD(linkonce_odr);
> 
> Modified: llvm/trunk/lib/AsmParser/LLParser.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLParser.cpp?rev=213777&r1=213776&r2=213777&view=diff
> ==============================================================================
> --- llvm/trunk/lib/AsmParser/LLParser.cpp (original)
> +++ llvm/trunk/lib/AsmParser/LLParser.cpp Wed Jul 23 13:09:31 2014
> @@ -254,8 +254,6 @@ bool LLParser::ParseTopLevelEntities() {
>     //               ('constant'|'global') ...
>     case lltok::kw_private:             // OptionalLinkage
>     case lltok::kw_internal:            // OptionalLinkage
> -    case lltok::kw_linker_private:      // Obsolete OptionalLinkage
> -    case lltok::kw_linker_private_weak: // Obsolete OptionalLinkage
>     case lltok::kw_weak:                // OptionalLinkage
>     case lltok::kw_weak_odr:            // OptionalLinkage
>     case lltok::kw_linkonce:            // OptionalLinkage
> @@ -1434,10 +1432,6 @@ bool LLParser::ParseOptionalReturnAttrs(
> ///   ::= 'common'
> ///   ::= 'extern_weak'
> ///   ::= 'external'
> -///
> -///   Deprecated Values:
> -///     ::= 'linker_private'
> -///     ::= 'linker_private_weak'
> bool LLParser::ParseOptionalLinkage(unsigned &Res, bool &HasLinkage) {
>   HasLinkage = false;
>   switch (Lex.getKind()) {
> @@ -1455,15 +1449,6 @@ bool LLParser::ParseOptionalLinkage(unsi
>   case lltok::kw_common:         Res = GlobalValue::CommonLinkage;        break;
>   case lltok::kw_extern_weak:    Res = GlobalValue::ExternalWeakLinkage;  break;
>   case lltok::kw_external:       Res = GlobalValue::ExternalLinkage;      break;
> -
> -  case lltok::kw_linker_private:
> -  case lltok::kw_linker_private_weak:
> -    Lex.Warning("'" + Lex.getStrVal() + "' is deprecated, treating as"
> -                " PrivateLinkage");
> -    Lex.Lex();
> -    // treat linker_private and linker_private_weak as PrivateLinkage
> -    Res = GlobalValue::PrivateLinkage;
> -    return false;
>   }
>   Lex.Lex();
>   HasLinkage = true;
> 
> Modified: llvm/trunk/lib/AsmParser/LLToken.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/AsmParser/LLToken.h?rev=213777&r1=213776&r2=213777&view=diff
> ==============================================================================
> --- llvm/trunk/lib/AsmParser/LLToken.h (original)
> +++ llvm/trunk/lib/AsmParser/LLToken.h Wed Jul 23 13:09:31 2014
> @@ -39,8 +39,6 @@ namespace lltok {
> 
>     kw_private,
>     kw_internal,
> -    kw_linker_private,          // NOTE: deprecated, for parser compatibility
> -    kw_linker_private_weak,     // NOTE: deprecated, for parser compatibility
>     kw_linkonce, kw_linkonce_odr,
>     kw_weak, // Used as a linkage, and a modifier for "cmpxchg".
>     kw_weak_odr, kw_appending,
> 
> Removed: llvm/trunk/test/Bitcode/deprecated-linker_private-linker_private_weak.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bitcode/deprecated-linker_private-linker_private_weak.ll?rev=213776&view=auto
> ==============================================================================
> --- llvm/trunk/test/Bitcode/deprecated-linker_private-linker_private_weak.ll (original)
> +++ llvm/trunk/test/Bitcode/deprecated-linker_private-linker_private_weak.ll (removed)
> @@ -1,17 +0,0 @@
> -; RUN: llvm-as -o - %s | llvm-dis | FileCheck %s
> -; RUN: llvm-as -o /dev/null %s 2>&1 | FileCheck %s -check-prefix CHECK-WARNINGS
> -
> - at .linker_private = linker_private unnamed_addr constant [15 x i8] c"linker_private\00", align 64
> - at .linker_private_weak = linker_private_weak unnamed_addr constant [20 x i8] c"linker_private_weak\00", align 64
> -
> -; CHECK: @.linker_private = private unnamed_addr constant [15 x i8] c"linker_private\00", align 64
> -; CHECK: @.linker_private_weak = private unnamed_addr constant [20 x i8] c"linker_private_weak\00", align 64
> -
> -; CHECK-WARNINGS: warning: '.linker_private' is deprecated, treating as PrivateLinkage
> -; CHECK-WARNINGS: @.linker_private = linker_private unnamed_addr constant [15 x i8] c"linker_private\00", align 64
> -; CHECK-WARNINGS:                    ^
> -
> -; CHECK-WARNINGS: warning: '.linker_private_weak' is deprecated, treating as PrivateLinkage
> -; CHECK-WARNINGS: @.linker_private_weak = linker_private_weak unnamed_addr constant [20 x i8] c"linker_private_weak\00", align 64
> -; CHECK-WARNINGS:                         ^
> -
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits