Skip to content

Commit 2da21a1

Browse files
banach-spacebanach-space
committed
[Utils] Add missing attributes in syntax files
Added the following attributes to all LLVM syntax files: * allocsize * cold * convergent * dereferenceable_or_null * hot * inaccessiblemem_or_argmemonly * inaccessiblememonly * inalloca * jumptable * nocallback * nocf_check * noduplicate * nofree * nomerge * noprofile * nosync * null_pointer_is_valid * optforfuzzing * preallocated * safestack * sanitize_hwaddress * sanitize_memtag * shadowcallstack * speculative_load_hardening * swifterror * syncscope * tailcc * willreturn I generated that list by comparing: * Attributes.inc (generated from Attributes.td), and * the Vim syntax file: llvm/utils/vim/syntax/llvm.vim My original intention was to focus on the Vim syntax file. Since other syntax files are also out-of-date, I added these attributes (if missing) to other files as well. Note that in the other sytnax files (i.e. for Emacs, VScode and Kate), there will be other attributes missing too. I've also sorted all attributes alphabetically. Otherwise it's really hard to automate adding new attributes. And I think that it was the original intent to keep all of them ordered alphabetically. Differential Revision: https://reviews.llvm.org/D97627
1 parent 210cc07 commit 2da21a1

File tree

4 files changed

+110
-24
lines changed

4 files changed

+110
-24
lines changed

‎llvm/utils/emacs/llvm-mode.el

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
(list
2323
;; Attributes
2424
`(,(regexp-opt
25-
'("alwaysinline" "argmemonly" "builtin" "cold" "convergent" "inaccessiblememonly"
26-
"inaccessiblemem_or_argmemonly" "inlinehint" "jumptable" "minsize" "mustprogress" "naked" "nobuiltin"
27-
"noduplicate" "nofree" "noimplicitfloat" "noinline" "nonlazybind" "noredzone" "noreturn"
28-
"norecurse" "noundef" "nounwind" "optnone" "optsize" "readnone" "readonly" "returns_twice"
29-
"speculatable" "ssp" "sspreq" "sspstrong" "safestack" "sanitize_address" "sanitize_hwaddress" "sanitize_memtag"
30-
"sanitize_thread" "sanitize_memory" "strictfp" "uwtable" "willreturn" "writeonly" "immarg") 'symbols) . font-lock-constant-face)
25+
'("alwaysinline" "argmemonly" "allocsize" "builtin" "cold" "convergent" "dereferenceable_or_null" "hot" "inaccessiblememonly"
26+
"inaccessiblemem_or_argmemonly" "inalloca" "inlinehint" "jumptable" "minsize" "mustprogress" "naked" "nobuiltin"
27+
"nocallback" "nocf_check" "noduplicate" "nofree" "noimplicitfloat" "noinline" "nomerge" "nonlazybind" "noprofile" "noredzone" "noreturn"
28+
"norecurse" "nosync" "noundef" "nounwind" "null_pointer_is_valid" "optforfuzzing" "optnone" "optsize" "preallocated" "readnone" "readonly" "returns_twice"
29+
"shadowcallstack" "speculatable" "speculative_load_hardening" "ssp" "sspreq" "sspstrong" "safestack" "sanitize_address" "sanitize_hwaddress" "sanitize_memtag"
30+
"sanitize_thread" "sanitize_memory" "strictfp" "swifterror" "uwtable" "willreturn" "writeonly" "immarg") 'symbols) . font-lock-constant-face)
3131
;; Variables
3232
'("%[-a-zA-Z$._][-a-zA-Z$._0-9]*" . font-lock-variable-name-face)
3333
;; Labels

‎llvm/utils/kate/llvm.xml

+34
Original file line numberDiff line numberDiff line change
@@ -77,25 +77,59 @@
7777
</list>
7878
<list name="function-attributes">
7979
<item> alignstack </item>
80+
<item> allocsize </item>
8081
<item> alwaysinline </item>
8182
<item> argmemonly </item>
83+
<item> arm_aapcscc </item>
84+
<item> catch </item>
85+
<item> cold </item>
8286
<item> convergent </item>
87+
<item> dereferenceable_or_null </item>
88+
<item> extern_weak </item>
89+
<item> hhvmcc </item>
90+
<item> hot </item>
91+
<item> inaccessiblemem_or_argmemonly </item>
92+
<item> inaccessiblememonly </item>
93+
<item> inalloca </item>
8394
<item> inlinehint </item>
95+
<item> inteldialect </item>
96+
<item> jumptable </item>
97+
<item> local_unnamed_addr </item>
8498
<item> mustprogress </item>
8599
<item> naked </item>
86100
<item> nobuiltin </item>
101+
<item> nocallback </item>
102+
<item> nocf_check </item>
103+
<item> noduplicate </item>
104+
<item> nofree </item>
87105
<item> noimplicitfloat </item>
88106
<item> noinline </item>
107+
<item> nomerge </item>
108+
<item> noprofile </item>
89109
<item> noredzone </item>
90110
<item> noreturn </item>
111+
<item> nosync </item>
91112
<item> nounwind </item>
113+
<item> null_pointer_is_valid </item>
114+
<item> optforfuzzing </item>
92115
<item> optnone </item>
93116
<item> optsize </item>
117+
<item> preallocated </item>
94118
<item> readnone </item>
95119
<item> readonly </item>
120+
<item> safestack </item>
121+
<item> sanitize_hwaddress </item>
122+
<item> sanitize_memtag </item>
123+
<item> shadowcallstack </item>
124+
<item> speculative_load_hardening </item>
96125
<item> ssp </item>
97126
<item> sspreq </item>
98127
<item> sspstrong </item>
128+
<item> swifterror </item>
129+
<item> syncscope </item>
130+
<item> tailcc </item>
131+
<item> willreturn </item>
132+
<item> willreturn </item>
99133
</list>
100134
<list name="types">
101135
<item> addrspace </item>

‎llvm/utils/vim/syntax/llvm.vim

+35-9
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,12 @@ syn keyword llvmKeyword
4444
\ alias
4545
\ align
4646
\ alignstack
47+
\ allocsize
4748
\ alwaysinline
4849
\ appending
4950
\ argmemonly
50-
\ arm_aapcscc
5151
\ arm_aapcs_vfpcc
52+
\ arm_aapcscc
5253
\ arm_apcscc
5354
\ asm
5455
\ atomic
@@ -58,51 +59,58 @@ syn keyword llvmKeyword
5859
\ byref
5960
\ byval
6061
\ c
61-
\ catch
6262
\ caller
63+
\ catch
6364
\ cc
6465
\ ccc
6566
\ cleanup
67+
\ cold
6668
\ coldcc
6769
\ comdat
6870
\ common
6971
\ constant
72+
\ convergent
7073
\ datalayout
7174
\ declare
7275
\ default
7376
\ define
7477
\ deplibs
7578
\ dereferenceable
79+
\ dereferenceable_or_null
7680
\ distinct
7781
\ dllexport
7882
\ dllimport
7983
\ dso_local
8084
\ dso_preemptable
8185
\ except
86+
\ extern_weak
8287
\ external
8388
\ externally_initialized
84-
\ extern_weak
8589
\ fastcc
86-
\ tailcc
8790
\ filter
8891
\ from
8992
\ gc
9093
\ global
91-
\ hhvmcc
9294
\ hhvm_ccc
95+
\ hhvmcc
9396
\ hidden
97+
\ hot
9498
\ immarg
99+
\ inaccessiblemem_or_argmemonly
100+
\ inaccessiblememonly
101+
\ inalloca
95102
\ initialexec
96103
\ inlinehint
97104
\ inreg
98-
\ inteldialect
99105
\ intel_ocl_bicc
106+
\ inteldialect
100107
\ internal
108+
\ jumptable
101109
\ linkonce
102110
\ linkonce_odr
111+
\ local_unnamed_addr
103112
\ localdynamic
104113
\ localexec
105-
\ local_unnamed_addr
106114
\ minsize
107115
\ module
108116
\ monotonic
@@ -113,19 +121,29 @@ syn keyword llvmKeyword
113121
\ nest
114122
\ noalias
115123
\ nobuiltin
124+
\ nocallback
116125
\ nocapture
126+
\ nocf_check
127+
\ noduplicate
128+
\ nofree
117129
\ noimplicitfloat
118130
\ noinline
131+
\ nomerge
119132
\ nonlazybind
120133
\ nonnull
134+
\ noprofile
121135
\ norecurse
122136
\ noredzone
123137
\ noreturn
138+
\ nosync
124139
\ noundef
125140
\ nounwind
141+
\ null_pointer_is_valid
142+
\ optforfuzzing
126143
\ optnone
127144
\ optsize
128145
\ personality
146+
\ preallocated
129147
\ private
130148
\ protected
131149
\ ptx_device
@@ -135,16 +153,20 @@ syn keyword llvmKeyword
135153
\ release
136154
\ returned
137155
\ returns_twice
156+
\ safestack
138157
\ sanitize_address
158+
\ sanitize_hwaddress
139159
\ sanitize_memory
160+
\ sanitize_memtag
140161
\ sanitize_thread
141162
\ section
142163
\ seq_cst
164+
\ shadowcallstack
143165
\ sideeffect
144166
\ signext
145-
\ syncscope
146167
\ source_filename
147168
\ speculatable
169+
\ speculative_load_hardening
148170
\ spir_func
149171
\ spir_kernel
150172
\ sret
@@ -153,8 +175,11 @@ syn keyword llvmKeyword
153175
\ sspstrong
154176
\ strictfp
155177
\ swiftcc
178+
\ swifterror
156179
\ swiftself
180+
\ syncscope
157181
\ tail
182+
\ tailcc
158183
\ target
159184
\ thread_local
160185
\ to
@@ -167,10 +192,11 @@ syn keyword llvmKeyword
167192
\ volatile
168193
\ weak
169194
\ weak_odr
195+
\ willreturn
196+
\ win64cc
170197
\ within
171198
\ writeonly
172199
\ x86_64_sysvcc
173-
\ win64cc
174200
\ x86_fastcallcc
175201
\ x86_stdcallcc
176202
\ x86_thiscallcc

‎llvm/utils/vscode/llvm/syntaxes/ll.tmLanguage.yaml

+35-9
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,12 @@ patterns:
143143
\\balias\\b|\
144144
\\balign\\b|\
145145
\\balignstack\\b|\
146+
\\ballocsize\\b|\
146147
\\balwaysinline\\b|\
147148
\\bappending\\b|\
148149
\\bargmemonly\\b|\
149-
\\barm_aapcscc\\b|\
150150
\\barm_aapcs_vfpcc\\b|\
151+
\\barm_aapcscc\\b|\
151152
\\barm_apcscc\\b|\
152153
\\basm\\b|\
153154
\\batomic\\b|\
@@ -157,51 +158,58 @@ patterns:
157158
\\bbyref\\b|\
158159
\\bbyval\\b|\
159160
\\bc\\b|\
160-
\\bcatch\\b|\
161161
\\bcaller\\b|\
162+
\\bcatch\\b|\
162163
\\bcc\\b|\
163164
\\bccc\\b|\
164165
\\bcleanup\\b|\
166+
\\bcold\\b|\
165167
\\bcoldcc\\b|\
166168
\\bcomdat\\b|\
167169
\\bcommon\\b|\
168170
\\bconstant\\b|\
171+
\\bconvergent\\b|\
169172
\\bdatalayout\\b|\
170173
\\bdeclare\\b|\
171174
\\bdefault\\b|\
172175
\\bdefine\\b|\
173176
\\bdeplibs\\b|\
174177
\\bdereferenceable\\b|\
178+
\\bdereferenceable_or_null\\b|\
175179
\\bdistinct\\b|\
176180
\\bdllexport\\b|\
177181
\\bdllimport\\b|\
178182
\\bdso_local\\b|\
179183
\\bdso_preemptable\\b|\
180184
\\bexcept\\b|\
185+
\\bextern_weak\\b|\
181186
\\bexternal\\b|\
182187
\\bexternally_initialized\\b|\
183-
\\bextern_weak\\b|\
184188
\\bfastcc\\b|\
185-
\\btailcc\\b|\
186189
\\bfilter\\b|\
187190
\\bfrom\\b|\
188191
\\bgc\\b|\
189192
\\bglobal\\b|\
190-
\\bhhvmcc\\b|\
191193
\\bhhvm_ccc\\b|\
194+
\\bhhvmcc\\b|\
192195
\\bhidden\\b|\
196+
\\bhot\\b|\
193197
\\bimmarg\\b|\
198+
\\binaccessiblemem_or_argmemonly\\b|\
199+
\\binaccessiblememonly\\b|\
200+
\\binalloc\\b|\
194201
\\binitialexec\\b|\
195202
\\binlinehint\\b|\
196203
\\binreg\\b|\
197-
\\binteldialect\\b|\
198204
\\bintel_ocl_bicc\\b|\
205+
\\binteldialect\\b|\
199206
\\binternal\\b|\
207+
\\bjumptable\\b|\
200208
\\blinkonce\\b|\
201209
\\blinkonce_odr\\b|\
210+
\\blocal_unnamed_addr\\b|\
202211
\\blocaldynamic\\b|\
203212
\\blocalexec\\b|\
204-
\\blocal_unnamed_addr\\b|\
205213
\\bminsize\\b|\
206214
\\bmodule\\b|\
207215
\\bmonotonic\\b|\
@@ -212,19 +220,29 @@ patterns:
212220
\\bnest\\b|\
213221
\\bnoalias\\b|\
214222
\\bnobuiltin\\b|\
223+
\\bnocallback\\b|\
215224
\\bnocapture\\b|\
225+
\\bnocf_check\\b|\
226+
\\bnoduplicate\\b|\
227+
\\bnofree\\b|\
216228
\\bnoimplicitfloat\\b|\
217229
\\bnoinline\\b|\
230+
\\bnomerge\\b|\
218231
\\bnonlazybind\\b|\
219232
\\bnonnull\\b|\
233+
\\bnoprofile\\b|\
220234
\\bnorecurse\\b|\
221235
\\bnoredzone\\b|\
222236
\\bnoreturn\\b|\
237+
\\bnosync\\b|\
223238
\\bnoundef\\b|\
224239
\\bnounwind\\b|\
240+
\\bnull_pointer_is_valid\\b|\
241+
\\boptforfuzzing\\b|\
225242
\\boptnone\\b|\
226243
\\boptsize\\b|\
227244
\\bpersonality\\b|\
245+
\\bpreallocated\\b|\
228246
\\bprivate\\b|\
229247
\\bprotected\\b|\
230248
\\bptx_device\\b|\
@@ -234,16 +252,20 @@ patterns:
234252
\\brelease\\b|\
235253
\\breturned\\b|\
236254
\\breturns_twice\\b|\
255+
\\bsafestack\\b|\
237256
\\bsanitize_address\\b|\
257+
\\bsanitize_hwaddress\\b|\
238258
\\bsanitize_memory\\b|\
259+
\\bsanitize_memtag\\b|\
239260
\\bsanitize_thread\\b|\
240261
\\bsection\\b|\
241262
\\bseq_cst\\b|\
263+
\\bshadowcallstack\\b|\
242264
\\bsideeffect\\b|\
243265
\\bsignext\\b|\
244-
\\bsyncscope\\b|\
245266
\\bsource_filename\\b|\
246267
\\bspeculatable\\b|\
268+
\\bspeculative_load_hardening\\b|\
247269
\\bspir_func\\b|\
248270
\\bspir_kernel\\b|\
249271
\\bsret\\b|\
@@ -252,8 +274,11 @@ patterns:
252274
\\bsspstrong\\b|\
253275
\\bstrictfp\\b|\
254276
\\bswiftcc\\b|\
277+
\\bswifterror\\b|\
255278
\\bswiftself\\b|\
279+
\\bsyncscope\\b|\
256280
\\btail\\b|\
281+
\\btailcc\\b|\
257282
\\btarget\\b|\
258283
\\bthread_local\\b|\
259284
\\bto\\b|\
@@ -266,10 +291,11 @@ patterns:
266291
\\bvolatile\\b|\
267292
\\bweak\\b|\
268293
\\bweak_odr\\b|\
294+
\\bwillreturn\\b|\
295+
\\bwin64cc\\b|\
269296
\\bwithin\\b|\
270297
\\bwriteonly\\b|\
271298
\\bx86_64_sysvcc\\b|\
272-
\\bwin64cc\\b|\
273299
\\bx86_fastcallcc\\b|\
274300
\\bx86_stdcallcc\\b|\
275301
\\bx86_thiscallcc\\b|\

0 commit comments

Comments
 (0)