author | Stefan Teleman <stefan.teleman@oracle.com> |
Wed, 10 Feb 2016 11:54:12 -0800 | |
changeset 5434 | 9f55c805ce9d |
permissions | -rw-r--r-- |
5434
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1 |
# - https://llvm.org/bugs/show_bug.cgi?id=22623 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
2 |
# - 22346218 - LLVM's assembler printer on SPARC needs a lot of work |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
3 |
# - 21874221 - clang C++ does not properly initialize the C++ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
4 |
# Standard Library's iostreams |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
5 |
# - 22582382 - Sun ld .init_array/.fini_array handling is incompatible |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
6 |
# with the GNU Toolchain |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
7 |
# - 22065707 - LLVM SPARC assembler generator emits wrong ELF Section flags |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
8 |
# For upstream - maybe. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
--- include/llvm/MC/MCStreamer.h 2014-12-05 18:14:41.000000000 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
10 |
+++ include/llvm/MC/MCStreamer.h 2015-12-09 15:14:25.413937273 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
11 |
@@ -478,6 +478,13 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
12 |
/// |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
13 |
virtual void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
14 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
15 |
+ /// EmitELFSize - Emit an ELF .size directive. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
16 |
+ /// |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
17 |
+ /// This corresponds to an assembler statement such as: |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
18 |
+ /// .size symbol, expression, but without a temp .label. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
19 |
+ /// |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
20 |
+ virtual void EmitELFSize(StringRef Name); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
21 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
22 |
/// \brief Emit a Linker Optimization Hint (LOH) directive. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
23 |
/// \param Args - Arguments of the LOH. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
24 |
virtual void EmitLOHDirective(MCLOHType Kind, const MCLOHArgs &Args) {} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
25 |
--- include/llvm/MC/MCSymbol.h 2014-12-24 02:27:50.000000000 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
26 |
+++ include/llvm/MC/MCSymbol.h 2015-12-09 14:05:18.864224028 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
27 |
@@ -51,23 +51,25 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
28 |
/// IsTemporary - True if this is an assembler temporary label, which |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
29 |
/// typically does not survive in the .o file's symbol table. Usually |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
30 |
/// "Lfoo" or ".foo". |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
31 |
- unsigned IsTemporary : 1; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
32 |
+ bool IsTemporary; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
33 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
34 |
/// \brief True if this symbol can be redefined. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
35 |
- unsigned IsRedefinable : 1; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
36 |
+ bool IsRedefinable; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
37 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
38 |
/// IsUsed - True if this symbol has been used. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
39 |
- mutable unsigned IsUsed : 1; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
40 |
+ mutable bool IsUsed; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
41 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
42 |
- private: // MCContext creates and uniques these. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
43 |
+ protected: // MCContext creates and uniques these. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
44 |
friend class MCExpr; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
45 |
friend class MCContext; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
46 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
47 |
MCSymbol(StringRef name, bool isTemporary) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
48 |
: Name(name), Section(nullptr), Value(nullptr), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
49 |
- IsTemporary(isTemporary), IsRedefinable(false), IsUsed(false) {} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
50 |
+ IsTemporary(isTemporary), IsRedefinable(false), IsUsed(false) {} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
51 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
52 |
MCSymbol(const MCSymbol&) LLVM_DELETED_FUNCTION; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
53 |
void operator=(const MCSymbol&) LLVM_DELETED_FUNCTION; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
54 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
55 |
public: |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
56 |
/// getName - Get the symbol name. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
57 |
StringRef getName() const { return Name; } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
58 |
--- lib/MC/MCAsmStreamer.cpp 2015-01-14 03:23:27.000000000 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
59 |
+++ lib/MC/MCAsmStreamer.cpp 2015-12-09 15:14:32.728543403 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
60 |
@@ -40,17 +40,18 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
61 |
protected: |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
62 |
formatted_raw_ostream &OS; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
63 |
const MCAsmInfo *MAI; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
64 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
65 |
private: |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
66 |
std::unique_ptr<MCInstPrinter> InstPrinter; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
67 |
std::unique_ptr<MCCodeEmitter> Emitter; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
68 |
std::unique_ptr<MCAsmBackend> AsmBackend; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
69 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
70 |
- SmallString<128> CommentToEmit; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
71 |
+ SmallString<256> CommentToEmit; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
72 |
raw_svector_ostream CommentStream; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
73 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
74 |
- unsigned IsVerboseAsm : 1; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
75 |
- unsigned ShowInst : 1; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
76 |
- unsigned UseDwarfDirectory : 1; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
77 |
+ bool IsVerboseAsm; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
78 |
+ bool ShowInst; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
79 |
+ bool UseDwarfDirectory; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
80 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
81 |
void EmitRegisterName(int64_t Register); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
82 |
void EmitCFIStartProcImpl(MCDwarfFrameInfo &Frame) override; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
83 |
@@ -61,10 +62,10 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
84 |
bool isVerboseAsm, bool useDwarfDirectory, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
85 |
MCInstPrinter *printer, MCCodeEmitter *emitter, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
86 |
MCAsmBackend *asmbackend, bool showInst) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
87 |
- : MCStreamer(Context), OS(os), MAI(Context.getAsmInfo()), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
88 |
- InstPrinter(printer), Emitter(emitter), AsmBackend(asmbackend), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
89 |
- CommentStream(CommentToEmit), IsVerboseAsm(isVerboseAsm), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
90 |
- ShowInst(showInst), UseDwarfDirectory(useDwarfDirectory) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
91 |
+ : MCStreamer(Context), OS(os), MAI(Context.getAsmInfo()), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
92 |
+ InstPrinter(printer), Emitter(emitter), AsmBackend(asmbackend), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
93 |
+ CommentStream(CommentToEmit), IsVerboseAsm(isVerboseAsm), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
94 |
+ ShowInst(showInst), UseDwarfDirectory(useDwarfDirectory) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
95 |
if (InstPrinter && IsVerboseAsm) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
96 |
InstPrinter->setCommentStream(CommentStream); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
97 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
98 |
@@ -75,8 +76,10 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
99 |
OS << '\n'; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
100 |
return; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
101 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
102 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
103 |
EmitCommentsAndEOL(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
104 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
105 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
106 |
void EmitCommentsAndEOL(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
107 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
108 |
/// isVerboseAsm - Return true if this streamer supports verbose assembly at |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
109 |
@@ -139,6 +142,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
110 |
void EmitCOFFSectionIndex(MCSymbol const *Symbol) override; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
111 |
void EmitCOFFSecRel32(MCSymbol const *Symbol) override; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
112 |
void EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) override; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
113 |
+ void EmitELFSize(StringRef Name) override; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
114 |
void EmitCommonSymbol(MCSymbol *Symbol, uint64_t Size, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
115 |
unsigned ByteAlignment) override; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
116 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
117 |
@@ -501,6 +505,11 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
118 |
OS << "\t.size\t" << *Symbol << ", " << *Value << '\n'; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
119 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
120 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
121 |
+void MCAsmStreamer::EmitELFSize(StringRef Name) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
122 |
+ assert(MAI->hasDotTypeDotSizeDirective()); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
123 |
+ OS << "\t.size\t" << Name << ", .-" << Name << '\n'; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
124 |
+} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
125 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
126 |
void MCAsmStreamer::EmitCommonSymbol(MCSymbol *Symbol, uint64_t Size, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
127 |
unsigned ByteAlignment) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
128 |
// Common symbols do not belong to any actual section. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
129 |
@@ -843,7 +852,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
130 |
if (NumFiles == Table.getMCDwarfFiles().size()) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
131 |
return FileNo; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
132 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
133 |
- SmallString<128> FullPathName; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
134 |
+ SmallString<PATH_MAX> FullPathName; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
135 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
136 |
if (!UseDwarfDirectory && !Directory.empty()) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
137 |
if (sys::path::is_absolute(Filename)) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
138 |
--- lib/MC/MCSectionELF.cpp 2014-10-09 14:23:39.000000000 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
139 |
+++ lib/MC/MCSectionELF.cpp 2016-01-21 10:12:17.006210825 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
140 |
@@ -59,8 +59,10 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
141 |
raw_ostream &OS, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
142 |
const MCExpr *Subsection) const { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
143 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
144 |
+ StringRef SectionName = getSectionName(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
145 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
146 |
if (ShouldOmitSectionDirective(SectionName, MAI)) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
147 |
- OS << '\t' << getSectionName(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
148 |
+ OS << '\t' << SectionName; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
149 |
if (Subsection) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
150 |
OS << '\t' << *Subsection; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
151 |
OS << '\n'; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
152 |
@@ -68,35 +70,20 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
153 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
154 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
155 |
OS << "\t.section\t"; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
156 |
- printName(OS, getSectionName()); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
157 |
- |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
158 |
- // Handle the weird solaris syntax if desired. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
159 |
- if (MAI.usesSunStyleELFSectionSwitchSyntax() && |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
160 |
- !(Flags & ELF::SHF_MERGE)) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
161 |
- if (Flags & ELF::SHF_ALLOC) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
162 |
- OS << ",#alloc"; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
163 |
- if (Flags & ELF::SHF_EXECINSTR) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
164 |
- OS << ",#execinstr"; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
165 |
- if (Flags & ELF::SHF_WRITE) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
166 |
- OS << ",#write"; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
167 |
- if (Flags & ELF::SHF_EXCLUDE) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
168 |
- OS << ",#exclude"; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
169 |
- if (Flags & ELF::SHF_TLS) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
170 |
- OS << ",#tls"; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
171 |
- OS << '\n'; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
172 |
- return; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
173 |
- } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
174 |
+ printName(OS, SectionName); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
175 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
176 |
OS << ",\""; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
177 |
if (Flags & ELF::SHF_ALLOC) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
178 |
OS << 'a'; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
179 |
if (Flags & ELF::SHF_EXCLUDE) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
180 |
OS << 'e'; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
181 |
- if (Flags & ELF::SHF_EXECINSTR) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
182 |
+ if ((Flags & ELF::SHF_EXECINSTR) && (Type != ELF::SHT_INIT_ARRAY) && |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
183 |
+ (Type != ELF::SHT_FINI_ARRAY) && (Type != ELF::SHT_PREINIT_ARRAY)) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
184 |
OS << 'x'; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
185 |
if (Flags & ELF::SHF_GROUP) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
186 |
OS << 'G'; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
187 |
- if (Flags & ELF::SHF_WRITE) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
188 |
+ if ((Flags & ELF::SHF_WRITE) || (Type == ELF::SHT_INIT_ARRAY) || |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
189 |
+ (Type == ELF::SHT_FINI_ARRAY) || (Type == ELF::SHT_PREINIT_ARRAY)) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
190 |
OS << 'w'; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
191 |
if (Flags & ELF::SHF_MERGE) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
192 |
OS << 'M'; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
193 |
@@ -144,6 +131,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
194 |
printName(OS, Group->getName()); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
195 |
OS << ",comdat"; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
196 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
197 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
198 |
OS << '\n'; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
199 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
200 |
if (Subsection) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
201 |
--- lib/MC/MCStreamer.cpp 2014-11-03 04:19:03.000000000 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
202 |
+++ lib/MC/MCStreamer.cpp 2015-12-09 15:15:14.428496845 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
203 |
@@ -636,6 +636,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
204 |
void MCStreamer::EmitCOFFSymbolStorageClass(int StorageClass) {} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
205 |
void MCStreamer::EmitCOFFSymbolType(int Type) {} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
206 |
void MCStreamer::EmitELFSize(MCSymbol *Symbol, const MCExpr *Value) {} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
207 |
+void MCStreamer::EmitELFSize(StringRef Name) {} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
208 |
void MCStreamer::EmitLocalCommonSymbol(MCSymbol *Symbol, uint64_t Size, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
209 |
unsigned ByteAlignment) {} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
210 |
void MCStreamer::EmitTBSSSymbol(const MCSection *Section, MCSymbol *Symbol, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
211 |
--- tools/clang/lib/CodeGen/CGBlocks.cpp 2015-10-05 11:01:32.352334965 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
212 |
+++ tools/clang/lib/CodeGen/CGBlocks.cpp 2015-12-07 15:24:59.295683990 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
213 |
@@ -1248,8 +1248,8 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
214 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
215 |
DI->EmitDeclareOfBlockDeclRefVariable(variable, BlockPointerDbgLoc, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
216 |
Builder, blockInfo, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
217 |
- entry_ptr == entry->end() |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
218 |
- ? nullptr : entry_ptr); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
219 |
+ entry_ptr == entry->end() ? |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
220 |
+ nullptr : &*entry_ptr); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
221 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
222 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
223 |
// Recover location if it was changed in the above loop. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
224 |
--- tools/clang/lib/CodeGen/CGCall.cpp 2015-10-05 11:01:32.348582888 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
225 |
+++ tools/clang/lib/CodeGen/CGCall.cpp 2015-12-07 15:26:25.691201743 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
226 |
@@ -2230,7 +2230,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
227 |
if (RetAI.getInAllocaSRet()) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
228 |
llvm::Function::arg_iterator EI = CurFn->arg_end(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
229 |
--EI; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
230 |
- llvm::Value *ArgStruct = EI; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
231 |
+ llvm::Value *ArgStruct = &*EI; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
232 |
llvm::Value *SRet = |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
233 |
Builder.CreateStructGEP(ArgStruct, RetAI.getInAllocaFieldIndex()); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
234 |
RV = Builder.CreateLoad(SRet, "sret"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
235 |
@@ -2246,7 +2246,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
236 |
ComplexPairTy RT = |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
237 |
EmitLoadOfComplex(MakeNaturalAlignAddrLValue(ReturnValue, RetTy), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
238 |
EndLoc); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
239 |
- EmitStoreOfComplex(RT, MakeNaturalAlignAddrLValue(AI, RetTy), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
240 |
+ EmitStoreOfComplex(RT, MakeNaturalAlignAddrLValue(&*AI, RetTy), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
241 |
/*isInit*/ true); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
242 |
break; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
243 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
244 |
@@ -2255,7 +2255,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
245 |
break; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
246 |
case TEK_Scalar: |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
247 |
EmitStoreOfScalar(Builder.CreateLoad(ReturnValue), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
248 |
- MakeNaturalAlignAddrLValue(AI, RetTy), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
249 |
+ MakeNaturalAlignAddrLValue(&*AI, RetTy), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
250 |
/*isInit*/ true); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
251 |
break; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
252 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
253 |
--- tools/clang/lib/CodeGen/CGDeclCXX.cpp 2015-10-05 11:01:32.000000000 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
254 |
+++ tools/clang/lib/CodeGen/CGDeclCXX.cpp 2016-02-01 09:42:57.409779098 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
255 |
@@ -23,6 +23,8 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
256 |
using namespace clang; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
257 |
using namespace CodeGen; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
258 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
259 |
+static unsigned InitPriority = 128; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
260 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
261 |
static void EmitDeclInit(CodeGenFunction &CGF, const VarDecl &D, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
262 |
llvm::Constant *DeclPtr) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
263 |
assert(D.hasGlobalStorage() && "VarDecl must have global storage!"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
264 |
@@ -137,9 +139,9 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
265 |
bool PerformInit) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
266 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
267 |
const Expr *Init = D.getInit(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
268 |
- QualType T = D.getType(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
269 |
+ QualType QT = D.getType(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
270 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
271 |
- if (!T->isReferenceType()) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
272 |
+ if (!QT->isReferenceType()) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
273 |
if (getLangOpts().OpenMP && D.hasAttr<OMPThreadPrivateDeclAttr>()) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
274 |
(void)CGM.getOpenMPRuntime().EmitOMPThreadPrivateVarDefinition( |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
275 |
&D, DeclPtr, D.getAttr<OMPThreadPrivateDeclAttr>()->getLocation(), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
276 |
@@ -157,7 +159,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
277 |
"destruction for reference"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
278 |
unsigned Alignment = getContext().getDeclAlign(&D).getQuantity(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
279 |
RValue RV = EmitReferenceBindingToExpr(Init); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
280 |
- EmitStoreOfScalar(RV.getScalarVal(), DeclPtr, false, Alignment, T); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
281 |
+ EmitStoreOfScalar(RV.getScalarVal(), DeclPtr, false, Alignment, QT); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
282 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
283 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
284 |
/// Create a stub function, suitable for being passed to atexit, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
285 |
@@ -166,22 +168,25 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
286 |
llvm::Constant *dtor, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
287 |
llvm::Constant *addr) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
288 |
// Get the destructor function type, void(*)(void). |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
289 |
- llvm::FunctionType *ty = llvm::FunctionType::get(CGM.VoidTy, false); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
290 |
- SmallString<256> FnName; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
291 |
+ llvm::FunctionType *FTy = llvm::FunctionType::get(CGM.VoidTy, false); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
292 |
+ SmallString<512> FnName; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
293 |
{ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
294 |
llvm::raw_svector_ostream Out(FnName); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
295 |
CGM.getCXXABI().getMangleContext().mangleDynamicAtExitDestructor(&VD, Out); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
296 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
297 |
- llvm::Function *fn = CGM.CreateGlobalInitOrDestructFunction(ty, FnName.str(), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
298 |
- VD.getLocation()); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
299 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
300 |
+ llvm::Function *Fn = |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
301 |
+ CGM.CreateGlobalInitOrDestructFunction(FTy, FnName.str(), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
302 |
+ VD.getLocation()); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
303 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
304 |
CodeGenFunction CGF(CGM); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
305 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
306 |
- CGF.StartFunction(&VD, CGM.getContext().VoidTy, fn, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
307 |
- CGM.getTypes().arrangeNullaryFunction(), FunctionArgList()); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
308 |
+ CGF.StartFunction(&VD, CGM.getContext().VoidTy, Fn, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
309 |
+ CGM.getTypes().arrangeNullaryFunction(), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
310 |
+ FunctionArgList()); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
311 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
312 |
llvm::CallInst *call = CGF.Builder.CreateCall(dtor, addr); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
313 |
- |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
314 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
315 |
// Make sure the call and the callee agree on calling convention. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
316 |
if (llvm::Function *dtorFn = |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
317 |
dyn_cast<llvm::Function>(dtor->stripPointerCasts())) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
318 |
@@ -189,7 +194,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
319 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
320 |
CGF.FinishFunction(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
321 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
322 |
- return fn; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
323 |
+ return Fn; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
324 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
325 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
326 |
/// Register a global destructor using the C atexit runtime function. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
327 |
@@ -203,12 +208,12 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
328 |
llvm::FunctionType *atexitTy = |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
329 |
llvm::FunctionType::get(IntTy, dtorStub->getType(), false); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
330 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
331 |
- llvm::Constant *atexit = |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
332 |
+ llvm::Constant *atExit = |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
333 |
CGM.CreateRuntimeFunction(atexitTy, "atexit"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
334 |
- if (llvm::Function *atexitFn = dyn_cast<llvm::Function>(atexit)) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
335 |
+ if (llvm::Function *atexitFn = dyn_cast<llvm::Function>(atExit)) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
336 |
atexitFn->setDoesNotThrow(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
337 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
338 |
- EmitNounwindRuntimeCall(atexit, dtorStub); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
339 |
+ EmitNounwindRuntimeCall(atExit, dtorStub); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
340 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
341 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
342 |
void CodeGenFunction::EmitCXXGuardedInit(const VarDecl &D, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
343 |
@@ -225,15 +230,29 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
344 |
CGM.getCXXABI().EmitGuardedInit(*this, D, DeclPtr, PerformInit); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
345 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
346 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
347 |
-llvm::Function *CodeGenModule::CreateGlobalInitOrDestructFunction( |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
348 |
- llvm::FunctionType *FTy, const Twine &Name, SourceLocation Loc, bool TLS) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
349 |
+llvm::Function* |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
350 |
+CodeGenModule::CreateGlobalInitOrDestructFunction(llvm::FunctionType *FTy, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
351 |
+ const Twine &Name, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
352 |
+ SourceLocation Loc, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
353 |
+ bool TLS) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
354 |
llvm::Function *Fn = |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
355 |
llvm::Function::Create(FTy, llvm::GlobalValue::InternalLinkage, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
356 |
Name, &getModule()); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
357 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
358 |
+ // Set the section if needed. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
359 |
if (!getLangOpts().AppleKext && !TLS) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
360 |
- // Set the section if needed. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
361 |
- if (const char *Section = getTarget().getStaticInitSectionSpecifier()) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
362 |
- Fn->setSection(Section); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
363 |
+ if (const char *Section = getTarget().getStaticInitSectionSpecifier()) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
364 |
+ if (getTriple().getOS() == llvm::Triple::Solaris) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
365 |
+ std::string FNm = Fn->getName().str(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
366 |
+ if ((FNm.find("_GLOBAL__sub_I_") != std::string::npos) && |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
367 |
+ !CodeGenOpts.UseInitArray) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
368 |
+ Fn->setSection(Section); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
369 |
+ else |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
370 |
+ Fn->setSection(".text"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
371 |
+ } else { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
372 |
+ Fn->setSection(Section); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
373 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
374 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
375 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
376 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
377 |
Fn->setCallingConv(getRuntimeCC()); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
378 |
@@ -241,13 +260,16 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
379 |
if (!getLangOpts().Exceptions) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
380 |
Fn->setDoesNotThrow(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
381 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
382 |
- if (!isInSanitizerBlacklist(Fn, Loc)) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
383 |
- if (getLangOpts().Sanitize.has(SanitizerKind::Address)) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
384 |
- Fn->addFnAttr(llvm::Attribute::SanitizeAddress); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
385 |
- if (getLangOpts().Sanitize.has(SanitizerKind::Thread)) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
386 |
- Fn->addFnAttr(llvm::Attribute::SanitizeThread); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
387 |
- if (getLangOpts().Sanitize.has(SanitizerKind::Memory)) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
388 |
- Fn->addFnAttr(llvm::Attribute::SanitizeMemory); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
389 |
+ // Solaris does not yet support the Sanitizer Libraries. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
390 |
+ if (getTriple().getOS() != llvm::Triple::Solaris) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
391 |
+ if (!isInSanitizerBlacklist(Fn, Loc)) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
392 |
+ if (getLangOpts().Sanitize.has(SanitizerKind::Address)) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
393 |
+ Fn->addFnAttr(llvm::Attribute::SanitizeAddress); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
394 |
+ if (getLangOpts().Sanitize.has(SanitizerKind::Thread)) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
395 |
+ Fn->addFnAttr(llvm::Attribute::SanitizeThread); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
396 |
+ if (getLangOpts().Sanitize.has(SanitizerKind::Memory)) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
397 |
+ Fn->addFnAttr(llvm::Attribute::SanitizeMemory); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
398 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
399 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
400 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
401 |
return Fn; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
402 |
@@ -260,9 +282,21 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
403 |
llvm::GlobalVariable *GV, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
404 |
llvm::Function *InitFunc, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
405 |
InitSegAttr *ISA) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
406 |
- llvm::GlobalVariable *PtrArray = new llvm::GlobalVariable( |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
407 |
- TheModule, InitFunc->getType(), /*isConstant=*/true, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
408 |
- llvm::GlobalValue::PrivateLinkage, InitFunc, "__cxx_init_fn_ptr"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
409 |
+ std::string GVN("__cxx_init_fn_ptr"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
410 |
+ if (getTriple().getOS() == llvm::Triple::Solaris) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
411 |
+ GVN += "_"; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
412 |
+ GVN += std::to_string(InitPriority++); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
413 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
414 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
415 |
+ llvm::GlobalVariable *PtrArray = nullptr; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
416 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
417 |
+ PtrArray = new llvm::GlobalVariable(TheModule, InitFunc->getType(), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
418 |
+ /*isConstant=*/ true, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
419 |
+ llvm::GlobalValue::PrivateLinkage, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
420 |
+ InitFunc, GVN); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
421 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
422 |
+ assert(PtrArray && "Invalid Function Pointer Array!"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
423 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
424 |
PtrArray->setSection(ISA->getSection()); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
425 |
addUsedGlobal(PtrArray); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
426 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
427 |
@@ -283,22 +317,76 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
428 |
CodeGenModule::EmitCXXGlobalVarDeclInitFunc(const VarDecl *D, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
429 |
llvm::GlobalVariable *Addr, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
430 |
bool PerformInit) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
431 |
- llvm::FunctionType *FTy = llvm::FunctionType::get(VoidTy, false); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
432 |
+ llvm::FunctionType *FTy = nullptr; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
433 |
+ std::vector<llvm::Type*> ArgsVec; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
434 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
435 |
+ if (getTriple().getOS() == llvm::Triple::Solaris) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
436 |
+ ArgsVec.push_back(IntTy); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
437 |
+ ArgsVec.push_back(IntTy); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
438 |
+ FTy = llvm::FunctionType::get(VoidTy, ArgsVec, false); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
439 |
+ } else { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
440 |
+ FTy = llvm::FunctionType::get(VoidTy, false); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
441 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
442 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
443 |
SmallString<256> FnName; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
444 |
{ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
445 |
llvm::raw_svector_ostream Out(FnName); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
446 |
- getCXXABI().getMangleContext().mangleDynamicInitializer(D, Out); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
447 |
+ if (getTriple().getOS() == llvm::Triple::Solaris) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
448 |
+ getCXXABI().getMangleContext().mangleGCCDynamicInitializer(D, Out); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
449 |
+ else |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
450 |
+ getCXXABI().getMangleContext().mangleDynamicInitializer(D, Out); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
451 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
452 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
453 |
// Create a variable initialization function. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
454 |
llvm::Function *Fn = |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
455 |
CreateGlobalInitOrDestructFunction(FTy, FnName.str(), D->getLocation()); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
456 |
+ Fn->setDoesNotThrow(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
457 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
458 |
auto *ISA = D->getAttr<InitSegAttr>(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
459 |
- CodeGenFunction(*this).GenerateCXXGlobalVarDeclInitFunc(Fn, D, Addr, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
460 |
- PerformInit); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
461 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
462 |
- llvm::GlobalVariable *COMDATKey = |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
463 |
+ if (getTriple().getOS() == llvm::Triple::Solaris) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
464 |
+ ASTContext &Ctx = getContext(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
465 |
+ auto *IPA = D->getAttr<InitPriorityAttr>(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
466 |
+ if (!IPA) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
467 |
+ IPA = InitPriorityAttr::CreateImplicit(Ctx, /* InitPriority */ 65535); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
468 |
+ VarDecl *DD = const_cast<VarDecl*>(D); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
469 |
+ DD->addAttr(IPA); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
470 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
471 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
472 |
+ if (!ISA && CodeGenOpts.UseInitArray) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
473 |
+ ISA = InitSegAttr::CreateImplicit(Ctx, PerformInit ? |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
474 |
+ StringRef(".init_array") : |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
475 |
+ StringRef(".fini_array")); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
476 |
+ VarDecl *DD = const_cast<VarDecl*>(D); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
477 |
+ DD->addAttr(ISA); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
478 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
479 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
480 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
481 |
+ FunctionArgList ArgList; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
482 |
+ ASTContext &Ctx = getContext(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
483 |
+ // We cannot allocate these dynamically because of a very ill-conceived |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
484 |
+ // operator new overload in DeclBase.h. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
485 |
+ ImplicitParamDecl IAFirst(Ctx, /*DC=*/ nullptr, D->getLocation(), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
486 |
+ /*Id=*/ nullptr, Ctx.UnsignedIntTy); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
487 |
+ ImplicitParamDecl IASecond(Ctx, /*DC=*/ nullptr, D->getLocation(), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
488 |
+ /*Id=*/ nullptr, Ctx.UnsignedIntTy); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
489 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
490 |
+ if (getTriple().getOS() == llvm::Triple::Solaris) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
491 |
+ // Add Parameters to the Function ArgumentList on Solaris |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
492 |
+ // for compatibility with the GCC C++ Runtime. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
493 |
+ ArgList.push_back(&IAFirst); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
494 |
+ ArgList.push_back(&IASecond); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
495 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
496 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
497 |
+ CodeGenFunction CGF(*this); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
498 |
+ CGF.GenerateCXXGlobalVarDeclInitFunc(Fn, D, Addr, PerformInit, ArgList); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
499 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
500 |
+ llvm::GlobalVariable *COMDATKey; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
501 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
502 |
+ if (getTriple().getOS() == llvm::Triple::Solaris) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
503 |
+ COMDATKey = D->isExternallyVisible() ? Addr : nullptr; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
504 |
+ else |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
505 |
+ COMDATKey = |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
506 |
supportsCOMDAT() && D->isExternallyVisible() ? Addr : nullptr; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
507 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
508 |
if (D->getTLSKind()) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
509 |
@@ -370,7 +458,6 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
510 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
511 |
llvm::FunctionType *FTy = llvm::FunctionType::get(VoidTy, false); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
512 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
513 |
- |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
514 |
// Create our global initialization function. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
515 |
if (!PrioritizedCXXGlobalInits.empty()) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
516 |
SmallVector<llvm::Function *, 8> LocalCXXGlobalInits; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
517 |
@@ -391,9 +478,10 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
518 |
// sure the function names are also ordered as priorities. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
519 |
std::string PrioritySuffix = llvm::utostr(Priority); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
520 |
// Priority is always <= 65535 (enforced by sema). |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
521 |
- PrioritySuffix = std::string(6-PrioritySuffix.size(), '0')+PrioritySuffix; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
522 |
- llvm::Function *Fn = CreateGlobalInitOrDestructFunction( |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
523 |
- FTy, "_GLOBAL__I_" + PrioritySuffix); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
524 |
+ PrioritySuffix = |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
525 |
+ std::string(6 - PrioritySuffix.size(), '0') + PrioritySuffix; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
526 |
+ llvm::Function *Fn = |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
527 |
+ CreateGlobalInitOrDestructFunction(FTy, "_GLOBAL__I_" + PrioritySuffix); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
528 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
529 |
for (; I < PrioE; ++I) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
530 |
LocalCXXGlobalInits.push_back(I->second); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
531 |
@@ -403,7 +491,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
532 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
533 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
534 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
535 |
- SmallString<128> FileName; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
536 |
+ SmallString<PATH_MAX> FileName; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
537 |
SourceManager &SM = Context.getSourceManager(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
538 |
if (const FileEntry *MainFile = SM.getFileEntryForID(SM.getMainFileID())) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
539 |
// Include the filename in the symbol name. Including "sub_" matches gcc and |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
540 |
@@ -417,14 +505,15 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
541 |
for (size_t i = 0; i < FileName.size(); ++i) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
542 |
// Replace everything that's not [a-zA-Z0-9._] with a _. This set happens |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
543 |
// to be the set of C preprocessing numbers. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
544 |
- if (!isPreprocessingNumberBody(FileName[i])) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
545 |
+ if (!isPreprocessingNumberBody(FileName[i]) || (FileName[i] == '.')) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
546 |
FileName[i] = '_'; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
547 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
548 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
549 |
llvm::Function *Fn = CreateGlobalInitOrDestructFunction( |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
550 |
FTy, llvm::Twine("_GLOBAL__sub_I_", FileName)); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
551 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
552 |
- CodeGenFunction(*this).GenerateCXXGlobalInitFunc(Fn, CXXGlobalInits); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
553 |
+ CodeGenFunction CGF(*this); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
554 |
+ CGF.GenerateCXXGlobalInitFunc(Fn, CXXGlobalInits); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
555 |
AddGlobalCtor(Fn); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
556 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
557 |
CXXGlobalInits.clear(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
558 |
@@ -445,28 +534,43 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
559 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
560 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
561 |
/// Emit the code necessary to initialize the given global variable. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
562 |
-void CodeGenFunction::GenerateCXXGlobalVarDeclInitFunc(llvm::Function *Fn, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
563 |
- const VarDecl *D, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
564 |
- llvm::GlobalVariable *Addr, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
565 |
- bool PerformInit) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
566 |
+void |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
567 |
+CodeGenFunction::GenerateCXXGlobalVarDeclInitFunc(llvm::Function *Fn, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
568 |
+ const VarDecl *D, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
569 |
+ llvm::GlobalVariable *Addr, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
570 |
+ bool PerformInit, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
571 |
+ FunctionArgList ArgList) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
572 |
// Check if we need to emit debug info for variable initializer. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
573 |
if (D->hasAttr<NoDebugAttr>()) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
574 |
DebugInfo = nullptr; // disable debug info indefinitely for this function |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
575 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
576 |
CurEHLocation = D->getLocStart(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
577 |
+ ASTContext &Ctx = getContext(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
578 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
579 |
- StartFunction(GlobalDecl(D), getContext().VoidTy, Fn, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
580 |
- getTypes().arrangeNullaryFunction(), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
581 |
- FunctionArgList(), D->getLocation(), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
582 |
+ FunctionType::ExtInfo ExtInfo; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
583 |
+ const CGFunctionInfo &FuncInfo = |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
584 |
+ getTypes().arrangeFreeFunctionDeclaration(Ctx.VoidTy, ArgList, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
585 |
+ ExtInfo, /*IsVariadic=*/ false); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
586 |
+ GlobalDecl GD(D); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
587 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
588 |
+ StartFunction(GD, Ctx.VoidTy, Fn, FuncInfo, ArgList, D->getLocation(), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
589 |
D->getInit()->getExprLoc()); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
590 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
591 |
- // Use guarded initialization if the global variable is weak. This |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
592 |
- // occurs for, e.g., instantiated static data members and |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
593 |
- // definitions explicitly marked weak. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
594 |
- if (Addr->hasWeakLinkage() || Addr->hasLinkOnceLinkage()) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
595 |
- EmitCXXGuardedInit(*D, Addr, PerformInit); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
596 |
+ if (CGM.getTriple().getOS() == llvm::Triple::Solaris) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
597 |
+ if (Addr->hasWeakLinkage()) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
598 |
+ EmitCXXGuardedInit(*D, Addr, PerformInit); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
599 |
+ } else { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
600 |
+ EmitCXXGlobalVarDeclInit(*D, Addr, PerformInit); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
601 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
602 |
} else { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
603 |
- EmitCXXGlobalVarDeclInit(*D, Addr, PerformInit); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
604 |
+ // Use guarded initialization if the global variable is weak. This |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
605 |
+ // occurs for, e.g., instantiated static data members and |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
606 |
+ // definitions explicitly marked weak. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
607 |
+ if (Addr->hasWeakLinkage() || Addr->hasLinkOnceLinkage()) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
608 |
+ EmitCXXGuardedInit(*D, Addr, PerformInit); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
609 |
+ } else { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
610 |
+ EmitCXXGlobalVarDeclInit(*D, Addr, PerformInit); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
611 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
612 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
613 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
614 |
FinishFunction(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
615 |
@@ -476,10 +580,21 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
616 |
CodeGenFunction::GenerateCXXGlobalInitFunc(llvm::Function *Fn, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
617 |
ArrayRef<llvm::Function *> Decls, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
618 |
llvm::GlobalVariable *Guard) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
619 |
+ llvm::FunctionType *FTy = llvm::FunctionType::get(VoidTy, false); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
620 |
+ ASTContext &Ctx = getContext(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
621 |
+ llvm::LLVMContext &LLVMCtx = CGM.getLLVMContext(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
622 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
623 |
{ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
624 |
ApplyDebugLocation NL(*this); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
625 |
- StartFunction(GlobalDecl(), getContext().VoidTy, Fn, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
626 |
- getTypes().arrangeNullaryFunction(), FunctionArgList()); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
627 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
628 |
+ FunctionArgList ArgList; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
629 |
+ FunctionType::ExtInfo ExtInfo; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
630 |
+ const CGFunctionInfo &FuncInfo = |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
631 |
+ getTypes().arrangeFreeFunctionDeclaration(Ctx.VoidTy, ArgList, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
632 |
+ ExtInfo, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
633 |
+ /*IsVariadic=*/ false); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
634 |
+ StartFunction(GlobalDecl(), Ctx.VoidTy, Fn, FuncInfo, ArgList); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
635 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
636 |
// Emit an artificial location for this function. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
637 |
ArtificialLocation AL(*this); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
638 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
639 |
@@ -509,9 +624,27 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
640 |
EmitObjCAutoreleasePoolCleanup(token); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
641 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
642 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
643 |
- for (unsigned i = 0, e = Decls.size(); i != e; ++i) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
644 |
- if (Decls[i]) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
645 |
- EmitRuntimeCall(Decls[i]); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
646 |
+ for (unsigned i = 0, e = Decls.size(); i != e; ++i) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
647 |
+ if (llvm::Function *FV = Decls[i]) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
648 |
+ if (CGM.getTriple().getOS() == llvm::Triple::Solaris) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
649 |
+ llvm::Value *Values[2] = { nullptr, nullptr }; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
650 |
+ Values[0] = |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
651 |
+ llvm::ConstantInt::get(llvm::Type::getInt32Ty(LLVMCtx), 1); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
652 |
+ Values[1] = |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
653 |
+ llvm::ConstantInt::get(llvm::Type::getInt32Ty(LLVMCtx), 65535); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
654 |
+ ArrayRef<llvm::Value*> ArgValues = llvm::makeArrayRef(Values); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
655 |
+ llvm::CallInst *CI = EmitRuntimeCall(FV, ArgValues); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
656 |
+#ifndef NDEBUG |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
657 |
+ llvm::Function *CIF = CI->getCalledFunction(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
658 |
+ assert (CIF && "Invalid function returned in CallInst!"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
659 |
+#else |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
660 |
+ (void) CI; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
661 |
+#endif |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
662 |
+ } else { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
663 |
+ EmitRuntimeCall(Decls[i]); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
664 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
665 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
666 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
667 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
668 |
Scope.ForceCleanup(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
669 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
670 |
@@ -569,8 +702,8 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
671 |
StartFunction(VD, getContext().VoidTy, fn, FI, args); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
672 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
673 |
emitDestroy(addr, type, destroyer, useEHCleanupForArray); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
674 |
- |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
675 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
676 |
FinishFunction(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
677 |
- |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
678 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
679 |
return fn; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
680 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
681 |
--- tools/clang/lib/CodeGen/CGExprScalar.cpp 2015-10-05 11:01:32.351864633 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
682 |
+++ tools/clang/lib/CodeGen/CGExprScalar.cpp 2015-12-07 16:39:38.372167280 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
683 |
@@ -2319,9 +2319,9 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
684 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
685 |
// Branch in case of overflow. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
686 |
llvm::BasicBlock *initialBB = Builder.GetInsertBlock(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
687 |
- llvm::Function::iterator insertPt = initialBB; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
688 |
+ llvm::Function::iterator insertPt = initialBB->getIterator(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
689 |
llvm::BasicBlock *continueBB = CGF.createBasicBlock("nooverflow", CGF.CurFn, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
690 |
- std::next(insertPt)); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
691 |
+ &*std::next(insertPt)); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
692 |
llvm::BasicBlock *overflowBB = CGF.createBasicBlock("overflow", CGF.CurFn); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
693 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
694 |
Builder.CreateCondBr(overflow, overflowBB, continueBB); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
695 |
--- tools/clang/lib/CodeGen/CGExpr.cpp 2015-10-05 11:01:32.356618553 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
696 |
+++ tools/clang/lib/CodeGen/CGExpr.cpp 2015-12-07 16:36:56.944848497 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
697 |
@@ -64,7 +64,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
698 |
llvm::Value *Init) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
699 |
auto *Store = new llvm::StoreInst(Init, Var); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
700 |
llvm::BasicBlock *Block = AllocaInsertPt->getParent(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
701 |
- Block->getInstList().insertAfter(&*AllocaInsertPt, Store); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
702 |
+ Block->getInstList().insertAfter(AllocaInsertPt->getIterator(), Store); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
703 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
704 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
705 |
llvm::AllocaInst *CodeGenFunction::CreateIRTemp(QualType Ty, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
706 |
--- tools/clang/lib/CodeGen/CGStmt.cpp 2015-10-05 11:01:32.627209320 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
707 |
+++ tools/clang/lib/CodeGen/CGStmt.cpp 2015-12-07 16:52:55.040873133 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
708 |
@@ -329,7 +329,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
709 |
return; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
710 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
711 |
// Can only simplify empty blocks. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
712 |
- if (BI != BB->begin()) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
713 |
+ if (BI->getIterator() != BB->begin()) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
714 |
return; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
715 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
716 |
BB->replaceAllUsesWith(BI->getSuccessor(0)); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
717 |
@@ -351,7 +351,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
718 |
// Place the block after the current block, if possible, or else at |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
719 |
// the end of the function. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
720 |
if (CurBB && CurBB->getParent()) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
721 |
- CurFn->getBasicBlockList().insertAfter(CurBB, BB); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
722 |
+ CurFn->getBasicBlockList().insertAfter(CurBB->getIterator(), BB); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
723 |
else |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
724 |
CurFn->getBasicBlockList().push_back(BB); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
725 |
Builder.SetInsertPoint(BB); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
726 |
@@ -378,7 +378,8 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
727 |
bool inserted = false; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
728 |
for (llvm::User *u : block->users()) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
729 |
if (llvm::Instruction *insn = dyn_cast<llvm::Instruction>(u)) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
730 |
- CurFn->getBasicBlockList().insertAfter(insn->getParent(), block); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
731 |
+ CurFn->getBasicBlockList().insertAfter(insn->getParent()->getIterator(), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
732 |
+ block); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
733 |
inserted = true; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
734 |
break; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
735 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
736 |
--- tools/clang/lib/CodeGen/CGVTables.cpp 2015-10-05 11:01:32.353244828 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
737 |
+++ tools/clang/lib/CodeGen/CGVTables.cpp 2015-12-07 17:11:22.736212205 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
738 |
@@ -158,12 +158,16 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
739 |
// Find the first store of "this", which will be to the alloca associated |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
740 |
// with "this". |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
741 |
llvm::Value *ThisPtr = &*AI; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
742 |
- llvm::BasicBlock *EntryBB = Fn->begin(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
743 |
+ llvm::BasicBlock *EntryBB = &Fn->front(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
744 |
llvm::Instruction *ThisStore = |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
745 |
- std::find_if(EntryBB->begin(), EntryBB->end(), [&](llvm::Instruction &I) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
746 |
- return isa<llvm::StoreInst>(I) && I.getOperand(0) == ThisPtr; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
747 |
- }); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
748 |
+ &*std::find_if(EntryBB->begin(), EntryBB->end(), [&](llvm::Instruction &I) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
749 |
+ { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
750 |
+ return isa<llvm::StoreInst>(I) && |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
751 |
+ I.getOperand(0) == ThisPtr; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
752 |
+ }); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
753 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
754 |
assert(ThisStore && "Store of this should be in entry block?"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
755 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
756 |
// Adjust "this", if necessary. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
757 |
Builder.SetInsertPoint(ThisStore); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
758 |
llvm::Value *AdjustedThisPtr = |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
759 |
--- tools/clang/lib/CodeGen/CodeGenFunction.cpp 2015-10-05 11:01:32.357401838 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
760 |
+++ tools/clang/lib/CodeGen/CodeGenFunction.cpp 2015-12-07 17:13:22.309802713 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
761 |
@@ -672,14 +672,14 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
762 |
auto AI = CurFn->arg_begin(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
763 |
if (CurFnInfo->getReturnInfo().isSRetAfterThis()) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
764 |
++AI; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
765 |
- ReturnValue = AI; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
766 |
+ ReturnValue = &*AI; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
767 |
} else if (CurFnInfo->getReturnInfo().getKind() == ABIArgInfo::InAlloca && |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
768 |
!hasScalarEvaluationKind(CurFnInfo->getReturnType())) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
769 |
// Load the sret pointer from the argument struct and return into that. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
770 |
unsigned Idx = CurFnInfo->getReturnInfo().getInAllocaFieldIndex(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
771 |
llvm::Function::arg_iterator EI = CurFn->arg_end(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
772 |
--EI; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
773 |
- llvm::Value *Addr = Builder.CreateStructGEP(EI, Idx); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
774 |
+ llvm::Value *Addr = Builder.CreateStructGEP(&*EI, Idx); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
775 |
ReturnValue = Builder.CreateLoad(Addr, "agg.result"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
776 |
} else { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
777 |
ReturnValue = CreateIRTemp(RetTy, "retval"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
778 |
--- tools/clang/lib/CodeGen/CodeGenFunction.h 2015-10-05 11:01:32.347172460 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
779 |
+++ tools/clang/lib/CodeGen/CodeGenFunction.h 2015-10-14 18:25:20.000000000 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
780 |
@@ -2572,10 +2572,11 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
781 |
void GenerateCXXGlobalVarDeclInitFunc(llvm::Function *Fn, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
782 |
const VarDecl *D, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
783 |
llvm::GlobalVariable *Addr, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
784 |
- bool PerformInit); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
785 |
+ bool PerformInit, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
786 |
+ FunctionArgList ArgList); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
787 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
788 |
void EmitCXXConstructExpr(const CXXConstructExpr *E, AggValueSlot Dest); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
789 |
- |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
790 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
791 |
void EmitSynthesizedCXXCopyCtor(llvm::Value *Dest, llvm::Value *Src, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
792 |
const Expr *Exp); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
793 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
794 |
--- tools/clang/lib/CodeGen/CodeGenModule.cpp 2015-10-05 11:01:32.354174460 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
795 |
+++ tools/clang/lib/CodeGen/CodeGenModule.cpp 2016-02-01 09:44:08.493171103 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
796 |
@@ -228,7 +228,8 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
797 |
OldF->replaceAllUsesWith(Replacement); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
798 |
if (NewF) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
799 |
NewF->removeFromParent(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
800 |
- OldF->getParent()->getFunctionList().insertAfter(OldF, NewF); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
801 |
+ OldF->getParent()->getFunctionList().insertAfter(OldF->getIterator(), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
802 |
+ NewF); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
803 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
804 |
OldF->eraseFromParent(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
805 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
806 |
@@ -272,8 +273,16 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
807 |
Error = true; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
808 |
Diags.Report(AA->getLocation(), diag::err_cyclic_alias); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
809 |
} else if (GV->isDeclaration()) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
810 |
- Error = true; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
811 |
- Diags.Report(AA->getLocation(), diag::err_alias_to_undefined); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
812 |
+ clang::Linkage L = D->getFormalLinkage(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
813 |
+ const auto *FD = cast<FunctionDecl>(D); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
814 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
815 |
+ if (!FD && ((L != clang::ExternalLinkage) && |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
816 |
+ (L != clang::UniqueExternalLinkage) && |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
817 |
+ (L != clang::InternalLinkage) && |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
818 |
+ (L != clang::VisibleNoLinkage))) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
819 |
+ Error = true; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
820 |
+ Diags.Report(AA->getLocation(), diag::err_alias_to_undefined); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
821 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
822 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
823 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
824 |
llvm::Constant *Aliasee = Alias->getAliasee(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
825 |
@@ -1310,10 +1319,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
826 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
827 |
void CodeGenModule::EmitGlobal(GlobalDecl GD) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
828 |
const auto *Global = cast<ValueDecl>(GD.getDecl()); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
829 |
- |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
830 |
- // Weak references don't produce any output by themselves. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
831 |
- if (Global->hasAttr<WeakRefAttr>()) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
832 |
- return; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
833 |
+ assert(Global && "Cast to ValueDecl yields nullptr!"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
834 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
835 |
// If this is an alias definition (which otherwise looks like a declaration) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
836 |
// emit it now. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
837 |
@@ -1485,16 +1491,11 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
838 |
void CodeGenModule::EmitGlobalDefinition(GlobalDecl GD, llvm::GlobalValue *GV) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
839 |
const auto *D = cast<ValueDecl>(GD.getDecl()); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
840 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
841 |
- PrettyStackTraceDecl CrashInfo(const_cast<ValueDecl *>(D), D->getLocation(), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
842 |
+ PrettyStackTraceDecl CrashInfo(const_cast<ValueDecl *>(D), D->getLocation(), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
843 |
Context.getSourceManager(), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
844 |
"Generating code for declaration"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
845 |
- |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
846 |
- if (isa<FunctionDecl>(D)) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
847 |
- // At -O0, don't generate IR for functions with available_externally |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
848 |
- // linkage. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
849 |
- if (!shouldEmitFunction(GD)) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
850 |
- return; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
851 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
852 |
+ if (isa<FunctionDecl>(D)) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
853 |
if (const auto *Method = dyn_cast<CXXMethodDecl>(D)) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
854 |
CompleteDIClassType(Method); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
855 |
// Make sure to emit the definition(s) before we emit the thunks. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
856 |
@@ -1512,13 +1513,18 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
857 |
return; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
858 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
859 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
860 |
- return EmitGlobalFunctionDefinition(GD, GV); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
861 |
+ EmitGlobalFunctionDefinition(GD, GV); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
862 |
+ return; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
863 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
864 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
865 |
+ if (const auto *VD = dyn_cast<VarDecl>(D)) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
866 |
+ EmitGlobalVarDefinition(VD); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
867 |
+ return; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
868 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
869 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
870 |
- if (const auto *VD = dyn_cast<VarDecl>(D)) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
871 |
- return EmitGlobalVarDefinition(VD); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
872 |
- |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
873 |
- llvm_unreachable("Invalid argument to EmitGlobalDefinition()"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
874 |
+ llvm::errs() << __PRETTY_FUNCTION__ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
875 |
+ << ": Invalid argument to EmitGlobalDefinition()!\n"; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
876 |
+ return; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
877 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
878 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
879 |
/// GetOrCreateLLVMFunction - If the specified mangled name is not in the |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
880 |
--- tools/clang/lib/CodeGen/CodeGenModule.h 2015-10-05 11:01:32.344046428 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
881 |
+++ tools/clang/lib/CodeGen/CodeGenModule.h 2015-10-20 21:11:16.000000000 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
882 |
@@ -692,7 +692,8 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
883 |
llvm::GlobalValue::LinkageTypes Linkage); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
884 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
885 |
llvm::Function * |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
886 |
- CreateGlobalInitOrDestructFunction(llvm::FunctionType *ty, const Twine &name, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
887 |
+ CreateGlobalInitOrDestructFunction(llvm::FunctionType *FTy, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
888 |
+ const Twine &Name, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
889 |
SourceLocation Loc = SourceLocation(), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
890 |
bool TLS = false); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
891 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
892 |
--- tools/clang/lib/CodeGen/CodeGenPGO.cpp 2015-10-05 11:01:32.349650190 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
893 |
+++ tools/clang/lib/CodeGen/CodeGenPGO.cpp 2015-12-08 07:11:06.067357170 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
894 |
@@ -788,8 +788,10 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
895 |
void CodeGenPGO::emitCounterIncrement(CGBuilderTy &Builder, unsigned Counter) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
896 |
if (!CGM.getCodeGenOpts().ProfileInstrGenerate || !RegionCounterMap) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
897 |
return; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
898 |
- if (!Builder.GetInsertPoint()) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
899 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
900 |
+ if (!Builder.GetInsertBlock()) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
901 |
return; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
902 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
903 |
auto *I8PtrTy = llvm::Type::getInt8PtrTy(CGM.getLLVMContext()); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
904 |
Builder.CreateCall4(CGM.getIntrinsic(llvm::Intrinsic::instrprof_increment), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
905 |
llvm::ConstantExpr::getBitCast(FuncNameVar, I8PtrTy), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
906 |
--- tools/clang/lib/Driver/ToolChains.cpp 2016-02-01 14:47:49.483365583 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
907 |
+++ tools/clang/lib/Driver/ToolChains.cpp 2016-02-01 09:12:57.596182227 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
908 |
@@ -2918,6 +2918,11 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
909 |
const llvm::Triple& TT = getTriple(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
910 |
llvm::Triple::ArchType Arch = TT.getArch(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
911 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
912 |
+ if (Arg *A = DriverArgs.getLastArg(options::OPT_fuse_init_array)) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
913 |
+ CC1Args.push_back("-fuse-init-array"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
914 |
+ DriverArgs.ClaimAllArgs(options::OPT_fuse_init_array); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
915 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
916 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
917 |
if (Arg *A = DriverArgs.getLastArg(options::OPT_mtune_EQ)) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
918 |
StringRef V = A->getValue(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
919 |
if (!V.empty()) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
920 |
--- tools/clang/lib/Driver/ToolChains.cpp 2016-02-01 18:49:01.325382261 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
921 |
+++ tools/clang/lib/Driver/ToolChains.cpp 2016-02-01 19:59:25.420298464 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
922 |
@@ -3012,13 +3012,22 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
923 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
924 |
void Solaris::findGCCMajorMinorMicro(const llvm::Triple& T) const { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
925 |
// FIXME: Add 5.2.0 after testing the ABI. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
926 |
- static const char* const GCCMMM[] = { "4.8.2", "4.8.5", "4.9.3" }; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
927 |
+ static const char* const GCCMMM[] = { "4.8.2", "4.9.3", "4.9.4" }; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
928 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
929 |
const char* P; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
930 |
std::string Path; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
931 |
std::string TripleString = llvm::sys::getDefaultTargetTriple(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
932 |
llvm::Triple::ArchType Arch = T.getArch(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
933 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
934 |
+ // GCC4 on Solaris is multilib 32/64. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
935 |
+ // GCC5 (not supported here yet) on Solaris is multilib 64/32. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
936 |
+ if (GCCMajorMinor[0] == '4') { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
937 |
+ if (TripleString.find("x86_64") != std::string::npos) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
938 |
+ TripleString.replace(0U, 6U, std::string("i386")); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
939 |
+ else if (TripleString.find("sparcv9") != std::string::npos) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
940 |
+ TripleString.replace(0U, 7U, std::string("sparc")); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
941 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
942 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
943 |
if (UseMediatedGCCToolChainPath) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
944 |
// FIXME: IMPLEMENT. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
945 |
// Needs spec. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
946 |
--- tools/clang/lib/Driver/Tools.cpp 2015-10-12 22:12:01.440488058 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
947 |
+++ tools/clang/lib/Driver/Tools.cpp 2016-02-01 10:32:24.767483623 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
948 |
@@ -45,6 +45,10 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
949 |
using namespace clang; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
950 |
using namespace llvm::opt; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
951 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
952 |
+#if defined(LLVM_ON_UNIX) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
953 |
+#include <sys/utsname.h> |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
954 |
+#endif |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
955 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
956 |
static void addAssemblerKPIC(const ArgList &Args, ArgStringList &CmdArgs) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
957 |
Arg *LastPICArg = Args.getLastArg(options::OPT_fPIC, options::OPT_fno_PIC, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
958 |
options::OPT_fpic, options::OPT_fno_pic, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
959 |
@@ -4595,8 +4599,10 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
960 |
// nice to enable this when doing a crashdump for modules as well. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
961 |
if (Args.hasFlag(options::OPT_frewrite_includes, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
962 |
options::OPT_fno_rewrite_includes, false) || |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
963 |
- (C.isForDiagnostics() && !HaveModules)) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
964 |
- CmdArgs.push_back("-frewrite-includes"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
965 |
+ (C.isForDiagnostics() && !HaveModules)) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
966 |
+ if (getToolChain().getTriple().getOS() != llvm::Triple::Solaris) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
967 |
+ CmdArgs.push_back("-frewrite-includes"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
968 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
969 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
970 |
// Only allow -traditional or -traditional-cpp outside in preprocessing modes. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
971 |
if (Arg *A = Args.getLastArg(options::OPT_traditional, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
972 |
@@ -6379,6 +6385,8 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
973 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
974 |
Args.AddAllArgValues(CmdArgs, options::OPT_Wa_COMMA, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
975 |
options::OPT_Xassembler); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
976 |
+ Args.ClaimAllArgs(options::OPT_Wa_COMMA); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
977 |
+ Args.ClaimAllArgs(options::OPT_Xassembler); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
978 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
979 |
for (const auto &II : Inputs) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
980 |
if (II.getType() == types::TY_LLVM_IR || |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
981 |
@@ -6517,6 +6525,11 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
982 |
ArgStringList CmdArgs; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
983 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
984 |
CmdArgs.push_back(Args.MakeArgString("-zignore")); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
985 |
+ CmdArgs.push_back(Args.MakeArgString("-zrelax=common")); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
986 |
+ CmdArgs.push_back(Args.MakeArgString("-zrelax=secadj")); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
987 |
+ CmdArgs.push_back(Args.MakeArgString("-zrelax=transtls")); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
988 |
+ if (D.CCCIsCXX()) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
989 |
+ CmdArgs.push_back(Args.MakeArgString("-zrelax=comdat")); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
990 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
991 |
Arg *PIEArg = Args.getLastArg(options::OPT_fPIE, options::OPT_fpie); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
992 |
if (PIEArg) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
993 |
@@ -6527,7 +6540,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
994 |
CmdArgs.push_back(Args.MakeArgString("-ztextwarn")); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
995 |
CmdArgs.push_back(Args.MakeArgString("-ztype=pie")); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
996 |
CmdArgs.push_back(Args.MakeArgString("-zaslr=enable")); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
997 |
- } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
998 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
999 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1000 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1001 |
// Silence warning for "-g: argument not used during compilation |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1002 |
@@ -6656,10 +6669,21 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1003 |
if (!Args.hasArg(options::OPT_nostdlib) && |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1004 |
!Args.hasArg(options::OPT_nostartfiles)) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1005 |
if (!Args.hasArg(options::OPT_shared)) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1006 |
+ std::string UNM = "5.12"; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1007 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1008 |
+#if defined(LLVM_ON_UNIX) // Because Windows? |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1009 |
+ struct utsname UTS; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1010 |
+ if (::uname(&UTS) == 0) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1011 |
+ UNM = UTS.version; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1012 |
+#endif |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1013 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1014 |
switch (Arch) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1015 |
case llvm::Triple::sparc: |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1016 |
case llvm::Triple::sparcv9: |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1017 |
- crt1o = GCCLibPath; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1018 |
+ if (UNM == "5.12") |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1019 |
+ crt1o = LibPath; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1020 |
+ else |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1021 |
+ crt1o = GCCLibPath; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1022 |
break; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1023 |
case llvm::Triple::x86: |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1024 |
case llvm::Triple::x86_64: |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1025 |
@@ -6754,7 +6778,8 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1026 |
CXAFinalize = *B + "/cxa_finalize.o"; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1027 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1028 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1029 |
- if (llvm::sys::fs::exists(CXAFinalize.c_str())) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1030 |
+ HasSystemCXAFinalize = llvm::sys::fs::exists(CXAFinalize.c_str()); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1031 |
+ if (D.CCCIsCXX() && HasSystemCXAFinalize) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1032 |
CmdArgs.push_back(Args.MakeArgString(CXAFinalize.c_str())); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1033 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1034 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1035 |
@@ -6784,8 +6809,10 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1036 |
// Itanium C++ ABI. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1037 |
if (D.CCCIsCXX()) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1038 |
if (!Args.hasArg(options::OPT_shared)) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1039 |
- const char* zfiniarray = "-zfiniarray=__cxa_finalize"; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1040 |
- CmdArgs.push_back(Args.MakeArgString(zfiniarray)); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1041 |
+ if (HasSystemCXAFinalize) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1042 |
+ const char* zfiniarray = "-zfiniarray=__cxa_finalize"; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1043 |
+ CmdArgs.push_back(Args.MakeArgString(zfiniarray)); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1044 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1045 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1046 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1047 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1048 |
@@ -6843,6 +6870,9 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1049 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1050 |
addProfileRT(TC, Args, CmdArgs); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1051 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1052 |
+ Args.ClaimAllArgs(options::OPT_Wl_COMMA); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1053 |
+ Args.ClaimAllArgs(options::OPT_Xlinker); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1054 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1055 |
C.addCommand(llvm::make_unique<Command>(JA, *this, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1056 |
Args.MakeArgString(Linker), |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1057 |
CmdArgs)); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1058 |
--- tools/clang/lib/Basic/Targets.cpp 2015-10-27 10:02:43.744975392 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1059 |
+++ tools/clang/lib/Basic/Targets.cpp 2016-02-01 08:33:09.756656790 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1060 |
@@ -537,6 +537,10 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1061 |
Builder.defineMacro("__ELF__"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1062 |
Builder.defineMacro("__svr4__"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1063 |
Builder.defineMacro("__SVR4"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1064 |
+ Builder.defineMacro("__SunOS", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1065 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1066 |
+ if (Opts.CPlusPlus || Opts.CPlusPlus11 || Opts.CPlusPlus14) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1067 |
+ Builder.defineMacro("__GTHREADS", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1068 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1069 |
if (Opts.C99 || Opts.CPlusPlus11) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1070 |
if (Opts.C99) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1071 |
@@ -549,39 +553,51 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1072 |
Builder.defineMacro("__C99FEATURES__", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1073 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1074 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1075 |
- if (Opts.CPlusPlus11) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1076 |
- Builder.defineMacro("__cplusplus", "201103L"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1077 |
- else if (Opts.CPlusPlus14) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1078 |
- Builder.defineMacro("__cplusplus", "201402L"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1079 |
+ if (Opts.CPlusPlus11 || Opts.CPlusPlus14) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1080 |
+ Builder.defineMacro("__STDCPP_STRICT_POINTER_SAFETY__", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1081 |
+ Builder.defineMacro("__STDCPP_THREADS__", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1082 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1083 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1084 |
if (Opts.CPlusPlus11) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1085 |
- Builder.defineMacro("_STDC_C11", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1086 |
+ Builder.defineMacro("__STDC_ISO_10646__", "201011L"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1087 |
+ Builder.defineMacro("__STDC_MB_MIGHT_NEQ_WC__", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1088 |
Builder.defineMacro("_STDC_C11_BCI", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1089 |
Builder.defineMacro("__XPG7_THREAD_MODEL__", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1090 |
Builder.defineMacro("_XPG7", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1091 |
Builder.defineMacro("_XOPEN_SOURCE", "700"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1092 |
} else if (Opts.C11 || Opts.CPlusPlus14) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1093 |
+ Builder.defineMacro("__STDC_HOSTED__", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1094 |
Builder.defineMacro("__STDC_VERSION__", "201112L"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1095 |
Builder.defineMacro("_STDC_C11", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1096 |
Builder.defineMacro("_STDC_C11_BCI", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1097 |
+ Builder.defineMacro("__STDC_ISO_10646__", "201011L"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1098 |
+ Builder.defineMacro("__STDC_MB_MIGHT_NEQ_WC__", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1099 |
+ Builder.defineMacro("__STDC_LIB_EXT1__", "201112L"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1100 |
+ Builder.defineMacro("__STDC_UTF_16__", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1101 |
+ Builder.defineMacro("__STDC_UTF_32__", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1102 |
Builder.defineMacro("__XPG7_THREAD_MODEL__", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1103 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1104 |
+ if (Opts.C11) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1105 |
+ Builder.defineMacro("__STDC_ANALYZABLE", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1106 |
+ Builder.defineMacro("__STDC_IEC_559__", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1107 |
+ Builder.defineMacro("__STDC_IEC_559_COMPLEX__", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1108 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1109 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1110 |
Builder.defineMacro("_XPG7", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1111 |
Builder.defineMacro("_XOPEN_SOURCE", "700"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1112 |
} else { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1113 |
Builder.defineMacro("_XOPEN_SOURCE", "500"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1114 |
Builder.defineMacro("__STDC_VERSION__", "199409L"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1115 |
- if (Opts.CPlusPlus && !Opts.CPlusPlus11 && !Opts.CPlusPlus14) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1116 |
- Builder.defineMacro("__cplusplus", "199711L"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1117 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1118 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1119 |
if ((Triple.getArchName() == "i386") || (Triple.getArchName() == "sparc")) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1120 |
Builder.defineMacro("_LARGEFILE_SOURCE"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1121 |
else if ((Triple.getArchName() == "x86_64") || |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1122 |
(Triple.getArchName() == "sparcv9")) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1123 |
- Builder.defineMacro("_LARGEFILE64_SOURCE"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1124 |
+ Builder.defineMacro("_LARGEFILE64_SOURCE", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1125 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1126 |
Builder.defineMacro("__EXTENSIONS__", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1127 |
- Builder.defineMacro("_REENTRANT"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1128 |
+ Builder.defineMacro("_REENTRANT", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1129 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1130 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1131 |
public: |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1132 |
@@ -590,6 +606,10 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1133 |
this->WCharType = this->SignedInt; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1134 |
// FIXME: WIntType should be SignedLong |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1135 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1136 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1137 |
+ virtual const char *getStaticInitSectionSpecifier() const override { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1138 |
+ return ".init"; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1139 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1140 |
}; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1141 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1142 |
// Windows target |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1143 |
--- tools/clang/include/clang/AST/Mangle.h 2014-09-16 08:18:21.000000000 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1144 |
+++ tools/clang/include/clang/AST/Mangle.h 2015-10-21 08:10:11.000000000 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1145 |
@@ -129,6 +129,8 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1146 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1147 |
virtual void mangleDynamicInitializer(const VarDecl *D, raw_ostream &) = 0; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1148 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1149 |
+ virtual void mangleGCCDynamicInitializer(const VarDecl *D, raw_ostream &) = 0; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1150 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1151 |
virtual void mangleDynamicAtExitDestructor(const VarDecl *D, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1152 |
raw_ostream &) = 0; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1153 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1154 |
--- tools/clang/lib/AST/ItaniumMangle.cpp 2015-10-05 11:01:32.264807353 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1155 |
+++ tools/clang/lib/AST/ItaniumMangle.cpp 2016-01-22 19:21:46.574349928 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1156 |
@@ -154,6 +154,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1157 |
void mangleCXXDtorComdat(const CXXDestructorDecl *D, raw_ostream &) override; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1158 |
void mangleStaticGuardVariable(const VarDecl *D, raw_ostream &) override; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1159 |
void mangleDynamicInitializer(const VarDecl *D, raw_ostream &Out) override; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1160 |
+ void mangleGCCDynamicInitializer(const VarDecl *D, raw_ostream &Out) override; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1161 |
void mangleDynamicAtExitDestructor(const VarDecl *D, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1162 |
raw_ostream &Out) override; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1163 |
void mangleItaniumThreadLocalInit(const VarDecl *D, raw_ostream &) override; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1164 |
@@ -3834,6 +3835,17 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1165 |
Out << "__cxx_global_var_init"; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1166 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1167 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1168 |
+void ItaniumMangleContextImpl::mangleGCCDynamicInitializer(const VarDecl *MD, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1169 |
+ raw_ostream &Out) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1170 |
+ static unsigned SEQ = 0UL; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1171 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1172 |
+ // Mangle GCC's __static_initialiation_and_destruction_<X> |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1173 |
+ // .init_array function. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1174 |
+ Out << "_Z41" << "__static_initialization_and_destruction_" |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1175 |
+ << SEQ << "ii"; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1176 |
+ ++SEQ; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1177 |
+} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1178 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1179 |
void ItaniumMangleContextImpl::mangleDynamicAtExitDestructor(const VarDecl *D, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1180 |
raw_ostream &Out) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1181 |
// Prefix the mangling of D with __dtor_. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1182 |
--- tools/clang/lib/AST/MicrosoftMangle.cpp 2014-12-21 22:24:49.000000000 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1183 |
+++ tools/clang/lib/AST/MicrosoftMangle.cpp 2015-10-21 08:12:50.000000000 -0700 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1184 |
@@ -132,6 +132,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1185 |
raw_ostream &) override; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1186 |
void mangleStaticGuardVariable(const VarDecl *D, raw_ostream &Out) override; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1187 |
void mangleDynamicInitializer(const VarDecl *D, raw_ostream &Out) override; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1188 |
+ void mangleGCCDynamicInitializer(const VarDecl *D, raw_ostream &Out) override; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1189 |
void mangleDynamicAtExitDestructor(const VarDecl *D, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1190 |
raw_ostream &Out) override; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1191 |
void mangleStringLiteral(const StringLiteral *SL, raw_ostream &Out) override; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1192 |
@@ -2407,6 +2408,11 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1193 |
mangleInitFiniStub(D, Out, 'E'); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1194 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1195 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1196 |
+void MicrosoftMangleContextImpl::mangleGCCDynamicInitializer(const VarDecl *D, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1197 |
+ raw_ostream &Out) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1198 |
+ mangleDynamicInitializer(D, Out); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1199 |
+} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1200 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1201 |
void |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1202 |
MicrosoftMangleContextImpl::mangleDynamicAtExitDestructor(const VarDecl *D, |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1203 |
raw_ostream &Out) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1204 |
--- tools/clang/lib/Frontend/InitPreprocessor.cpp 2016-02-02 07:35:41.701519177 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1205 |
+++ tools/clang/lib/Frontend/InitPreprocessor.cpp 2016-02-02 08:45:58.127181898 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1206 |
@@ -476,9 +476,16 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1207 |
if (!LangOpts.MSVCCompat) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1208 |
// Currently claim to be compatible with GCC 4.2.1-5621, but only if we're |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1209 |
// not compiling for MSVC compatibility |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1210 |
+ if (TI.getTriple().getOS() == llvm::Triple::Solaris) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1211 |
+ Builder.defineMacro("__GNUC_MINOR__", "8"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1212 |
+ Builder.defineMacro("__GNUC_PATCHLEVEL__", "0"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1213 |
+ } else { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1214 |
Builder.defineMacro("__GNUC_MINOR__", "2"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1215 |
Builder.defineMacro("__GNUC_PATCHLEVEL__", "1"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1216 |
+ } |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1217 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1218 |
Builder.defineMacro("__GNUC__", "4"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1219 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1220 |
// GCC provides a number of C++ ABI Versions in: |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1221 |
// ${top_srcdir}/gcc/c-family/c-cppbuiltin.c |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1222 |
// Currently valid GXX ABI Versions are documented here: |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1223 |
--- tools/clang/lib/Driver/ToolChains.cpp 2016-02-02 07:35:42.102842090 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1224 |
+++ tools/clang/lib/Driver/ToolChains.cpp 2016-02-02 09:01:01.559630875 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1225 |
@@ -2923,6 +2923,11 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1226 |
DriverArgs.ClaimAllArgs(options::OPT_fuse_init_array); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1227 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1228 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1229 |
+ if (DriverArgs.getLastArg(options::OPT_fabi_version_EQ) == nullptr) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1230 |
+ CC1Args.push_back("-fabi-version=4"); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1231 |
+ else |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1232 |
+ DriverArgs.ClaimAllArgs(options::OPT_fabi_version_EQ); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1233 |
+ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1234 |
if (Arg *A = DriverArgs.getLastArg(options::OPT_mtune_EQ)) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1235 |
StringRef V = A->getValue(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1236 |
if (!V.empty()) |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1237 |
@@ -2931,7 +2936,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1238 |
// FIXME: Impplement SPARC target features. |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1239 |
CC1Args.push_back(DriverArgs.MakeArgString("-target-feature")); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1240 |
if (Arch == llvm::Triple::sparc || Arch == llvm::Triple::sparcv9) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1241 |
- std::string S = "mtune="; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1242 |
+ std::string S = "-mtune="; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1243 |
S += mtune; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1244 |
CC1Args.push_back(DriverArgs.MakeArgString(S.c_str())); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1245 |
} else { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1246 |
@@ -2947,7 +2952,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1247 |
CC1Args.push_back(DriverArgs.MakeArgString("-target-feature")); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1248 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1249 |
if ((Arch == llvm::Triple::sparc) || (Arch == llvm::Triple::sparcv9)) { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1250 |
- std::string S = "march="; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1251 |
+ std::string S = "-march="; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1252 |
S += mtune; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1253 |
CC1Args.push_back(DriverArgs.MakeArgString(S.c_str())); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1254 |
} else { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1255 |
@@ -2965,7 +2970,7 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1256 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1257 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1258 |
CC1Args.push_back(DriverArgs.MakeArgString("-target-feature")); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1259 |
- std::string S = "mcpu="; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1260 |
+ std::string S = "-mcpu="; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1261 |
S += mcpu; |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1262 |
CC1Args.push_back(DriverArgs.MakeArgString(S.c_str())); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1263 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1264 |
--- tools/clang/lib/Driver/Tools.cpp 2016-02-02 07:35:42.107579301 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1265 |
+++ tools/clang/lib/Driver/Tools.cpp 2016-02-02 09:00:08.889301970 -0800 |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1266 |
@@ -3000,6 +3000,8 @@ |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1267 |
StringRef v = A->getValue(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1268 |
CmdArgs.push_back(Args.MakeArgString("-fabi-version=" + v)); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1269 |
A->claim(); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1270 |
+ } else { |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1271 |
+ CmdArgs.push_back(Args.MakeArgString("-fabi-version=4")); |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1272 |
} |
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1273 |
|
9f55c805ce9d
PSARC/2013/188 Clang/LLVM
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
1274 |
if (Arg *A = Args.getLastArg(options::OPT_fpcc_struct_return, |