[llvm-branch-commits] [llvm-branch] r205764 - Merging r196168:
Tom Stellard
thomas.stellard at amd.com
Tue Apr 8 07:27:47 PDT 2014
Author: tstellar
Date: Tue Apr 8 09:27:47 2014
New Revision: 205764
URL: http://llvm.org/viewvc/llvm-project?rev=205764&view=rev
Log:
Merging r196168:
------------------------------------------------------------------------
r196168 | rafael.espindola | 2013-12-02 18:04:51 -0500 (Mon, 02 Dec 2013) | 2 lines
Convert two char* that are only ever used as booleans to bool.
------------------------------------------------------------------------
Modified:
llvm/branches/release_34/include/llvm/MC/MCAsmInfo.h
llvm/branches/release_34/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
llvm/branches/release_34/lib/MC/MCAsmInfo.cpp
llvm/branches/release_34/lib/MC/MCAsmInfoCOFF.cpp
llvm/branches/release_34/lib/MC/MCAsmInfoDarwin.cpp
llvm/branches/release_34/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp
Modified: llvm/branches/release_34/include/llvm/MC/MCAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/include/llvm/MC/MCAsmInfo.h?rev=205764&r1=205763&r2=205764&view=diff
==============================================================================
--- llvm/branches/release_34/include/llvm/MC/MCAsmInfo.h (original)
+++ llvm/branches/release_34/include/llvm/MC/MCAsmInfo.h Tue Apr 8 09:27:47 2014
@@ -266,13 +266,12 @@ namespace llvm {
/// global as being a weak undefined symbol.
const char *WeakRefDirective; // Defaults to NULL.
- /// WeakDefDirective - This directive, if non-null, is used to declare a
- /// global as being a weak defined symbol.
- const char *WeakDefDirective; // Defaults to NULL.
-
- /// LinkOnceDirective - This directive, if non-null is used to declare a
- /// global as being a weak defined symbol. This is used on cygwin/mingw.
- const char *LinkOnceDirective; // Defaults to NULL.
+ /// True if we have a directive to declare a global as being a weak
+ /// defined symbol.
+ bool HasWeakDefDirective; // Defaults to false.
+
+ /// True if we have a .linkonce directive. This is used on cygwin/mingw.
+ bool HasLinkOnceDirective; // Defaults to false.
/// HiddenVisibilityAttr - This attribute, if not MCSA_Invalid, is used to
/// declare a symbol as having hidden visibility.
@@ -497,8 +496,8 @@ namespace llvm {
bool hasIdentDirective() const { return HasIdentDirective; }
bool hasNoDeadStrip() const { return HasNoDeadStrip; }
const char *getWeakRefDirective() const { return WeakRefDirective; }
- const char *getWeakDefDirective() const { return WeakDefDirective; }
- const char *getLinkOnceDirective() const { return LinkOnceDirective; }
+ bool hasWeakDefDirective() const { return HasWeakDefDirective; }
+ bool hasLinkOnceDirective() const { return HasLinkOnceDirective; }
MCSymbolAttr getHiddenVisibilityAttr() const { return HiddenVisibilityAttr;}
MCSymbolAttr getHiddenDeclarationVisibilityAttr() const {
Modified: llvm/branches/release_34/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=205764&r1=205763&r2=205764&view=diff
==============================================================================
--- llvm/branches/release_34/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original)
+++ llvm/branches/release_34/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Tue Apr 8 09:27:47 2014
@@ -222,7 +222,7 @@ void AsmPrinter::EmitLinkage(const Globa
case GlobalValue::WeakAnyLinkage:
case GlobalValue::WeakODRLinkage:
case GlobalValue::LinkerPrivateWeakLinkage:
- if (MAI->getWeakDefDirective() != 0) {
+ if (MAI->hasWeakDefDirective()) {
// .globl _foo
OutStreamer.EmitSymbolAttribute(GVSym, MCSA_Global);
@@ -243,7 +243,7 @@ void AsmPrinter::EmitLinkage(const Globa
OutStreamer.EmitSymbolAttribute(GVSym, MCSA_WeakDefinition);
else
OutStreamer.EmitSymbolAttribute(GVSym, MCSA_WeakDefAutoPrivate);
- } else if (MAI->getLinkOnceDirective() != 0) {
+ } else if (MAI->hasLinkOnceDirective()) {
// .globl _foo
OutStreamer.EmitSymbolAttribute(GVSym, MCSA_Global);
//NOTE: linkonce is handled by the section the symbol was assigned to.
Modified: llvm/branches/release_34/lib/MC/MCAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/lib/MC/MCAsmInfo.cpp?rev=205764&r1=205763&r2=205764&view=diff
==============================================================================
--- llvm/branches/release_34/lib/MC/MCAsmInfo.cpp (original)
+++ llvm/branches/release_34/lib/MC/MCAsmInfo.cpp Tue Apr 8 09:27:47 2014
@@ -76,8 +76,8 @@ MCAsmInfo::MCAsmInfo() {
HasIdentDirective = false;
HasNoDeadStrip = false;
WeakRefDirective = 0;
- WeakDefDirective = 0;
- LinkOnceDirective = 0;
+ HasWeakDefDirective = false;
+ HasLinkOnceDirective = false;
HiddenVisibilityAttr = MCSA_Hidden;
HiddenDeclarationVisibilityAttr = MCSA_Hidden;
ProtectedVisibilityAttr = MCSA_Protected;
Modified: llvm/branches/release_34/lib/MC/MCAsmInfoCOFF.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/lib/MC/MCAsmInfoCOFF.cpp?rev=205764&r1=205763&r2=205764&view=diff
==============================================================================
--- llvm/branches/release_34/lib/MC/MCAsmInfoCOFF.cpp (original)
+++ llvm/branches/release_34/lib/MC/MCAsmInfoCOFF.cpp Tue Apr 8 09:27:47 2014
@@ -27,7 +27,7 @@ MCAsmInfoCOFF::MCAsmInfoCOFF() {
HasSingleParameterDotFile = false;
PrivateGlobalPrefix = "L"; // Prefix for private global symbols
WeakRefDirective = "\t.weak\t";
- LinkOnceDirective = "\t.linkonce discard\n";
+ HasLinkOnceDirective = true;
// Doesn't support visibility:
HiddenVisibilityAttr = HiddenDeclarationVisibilityAttr = MCSA_Invalid;
Modified: llvm/branches/release_34/lib/MC/MCAsmInfoDarwin.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/lib/MC/MCAsmInfoDarwin.cpp?rev=205764&r1=205763&r2=205764&view=diff
==============================================================================
--- llvm/branches/release_34/lib/MC/MCAsmInfoDarwin.cpp (original)
+++ llvm/branches/release_34/lib/MC/MCAsmInfoDarwin.cpp Tue Apr 8 09:27:47 2014
@@ -36,7 +36,7 @@ MCAsmInfoDarwin::MCAsmInfoDarwin() {
InlineAsmEnd = " InlineAsm End";
// Directives:
- WeakDefDirective = "\t.weak_definition ";
+ HasWeakDefDirective = true;
WeakRefDirective = "\t.weak_reference ";
ZeroDirective = "\t.space\t"; // ".space N" emits N zeros.
HasMachoZeroFillDirective = true; // Uses .zerofill
Modified: llvm/branches/release_34/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp?rev=205764&r1=205763&r2=205764&view=diff
==============================================================================
--- llvm/branches/release_34/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp (original)
+++ llvm/branches/release_34/lib/Target/R600/MCTargetDesc/AMDGPUMCAsmInfo.cpp Tue Apr 8 09:27:47 2014
@@ -13,7 +13,6 @@
using namespace llvm;
AMDGPUMCAsmInfo::AMDGPUMCAsmInfo(StringRef &TT) : MCAsmInfo() {
HasSingleParameterDotFile = false;
- WeakDefDirective = 0;
//===------------------------------------------------------------------===//
HasSubsectionsViaSymbols = true;
HasMachoZeroFillDirective = false;
@@ -58,7 +57,6 @@ AMDGPUMCAsmInfo::AMDGPUMCAsmInfo(StringR
HasDotTypeDotSizeDirective = false;
HasNoDeadStrip = true;
WeakRefDirective = ".weakref\t";
- LinkOnceDirective = 0;
//===--- Dwarf Emission Directives -----------------------------------===//
HasLEB128 = true;
SupportsDebugInformation = true;
More information about the llvm-branch-commits
mailing list