Skip to content

Commit c4f4485

Browse files
committed
Revert "runtime: add a workaround for Windows build"
This reverts commit efaf1fb. Add a much more palatable workaround for the unit tests. Rather than adding the dllimport for the symbols, locally define the required symbols. This list is sufficient to restore the ability to build tests for Windows.
1 parent bf1ab6c commit c4f4485

File tree

2 files changed

+216
-7
lines changed

2 files changed

+216
-7
lines changed

stdlib/public/runtime/MetadataLookup.cpp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -730,14 +730,8 @@ _findContextDescriptorInCache(TypeMetadataPrivateState &T,
730730
$sS ## CHAR ## SUFFIX
731731
#define DESCRIPTOR_MANGLING(CHAR, SUFFIX) DESCRIPTOR_MANGLING_(CHAR, SUFFIX)
732732

733-
#if defined(_WIN32)
734-
#define swiftCore_EXPORTS __declspec(dllimport)
735-
#else
736-
#define swiftCore_EXPORTS
737-
#endif
738-
739733
#define STANDARD_TYPE(KIND, MANGLING, TYPENAME) \
740-
extern "C" swiftCore_EXPORTS const ContextDescriptor DESCRIPTOR_MANGLING(MANGLING, DESCRIPTOR_MANGLING_SUFFIX(KIND));
734+
extern "C" const ContextDescriptor DESCRIPTOR_MANGLING(MANGLING, DESCRIPTOR_MANGLING_SUFFIX(KIND));
741735

742736
#if !SWIFT_OBJC_INTEROP
743737
# define OBJC_INTEROP_STANDARD_TYPE(KIND, MANGLING, TYPENAME)

unittests/runtime/Stdlib.cpp

Lines changed: 215 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,221 @@ const long long $ssSeVMn[1] = {0};
204204
SWIFT_RUNTIME_STDLIB_INTERNAL
205205
const long long $sShMn[1] = {0};
206206

207+
// Bool
208+
209+
SWIFT_RUNTIME_STDLIB_INTERNAL
210+
const long long $sSbMn[1] = {0};
211+
212+
// Binary Floating Point
213+
214+
SWIFT_RUNTIME_STDLIB_INTERNAL
215+
const long long $sSBMp[1] = {0};
216+
217+
// Double
218+
219+
SWIFT_RUNTIME_STDLIB_INTERNAL
220+
const long long $sSdMn[1] = {0};
221+
222+
// RandomNumberGenerator
223+
224+
SWIFT_RUNTIME_STDLIB_INTERNAL
225+
const long long $sSGMp[1] = {0};
226+
227+
// Int
228+
229+
SWIFT_RUNTIME_STDLIB_INTERNAL
230+
const long long $sSiMn[1] = {0};
231+
232+
// DefaultIndicis
233+
234+
SWIFT_RUNTIME_STDLIB_INTERNAL
235+
const long long $sSIMn[1] = {0};
236+
237+
// Character
238+
239+
SWIFT_RUNTIME_STDLIB_INTERNAL
240+
const long long $sSJMn[1] = {0};
241+
242+
// Numeric
243+
244+
SWIFT_RUNTIME_STDLIB_INTERNAL
245+
const long long $sSjMp[1] = {0};
246+
247+
// RandomAccessCollection
248+
249+
SWIFT_RUNTIME_STDLIB_INTERNAL
250+
const long long $sSkMp[1] = {0};
251+
252+
// BidirectionalCollection
253+
254+
SWIFT_RUNTIME_STDLIB_INTERNAL
255+
const long long $sSKMp[1] = {0};
256+
257+
// RangeReplacementCollection
258+
259+
SWIFT_RUNTIME_STDLIB_INTERNAL
260+
const long long $sSmMp[1] = {0};
261+
262+
// MutationCollection
263+
264+
SWIFT_RUNTIME_STDLIB_INTERNAL
265+
const long long $sSMMp[1] = {0};
266+
267+
// Range
268+
269+
SWIFT_RUNTIME_STDLIB_INTERNAL
270+
const long long $sSnMn[1] = {0};
271+
272+
// ClosedRange
273+
274+
SWIFT_RUNTIME_STDLIB_INTERNAL
275+
const long long $sSNMn[1] = {0};
276+
277+
// ObjectIdentifier
278+
279+
SWIFT_RUNTIME_STDLIB_INTERNAL
280+
const long long $sSOMn[1] = {0};
281+
282+
// UnsafeMutablePointer
283+
284+
SWIFT_RUNTIME_STDLIB_INTERNAL
285+
const long long $sSpMn[1] = {0};
286+
287+
// Optional
288+
289+
SWIFT_RUNTIME_STDLIB_INTERNAL
290+
const long long $sSqMn[1] = {0};
291+
292+
// Equatable
293+
294+
SWIFT_RUNTIME_STDLIB_INTERNAL
295+
const long long $sSQMp[1] = {0};
296+
297+
// UnsafeMutableBufferPointer
298+
299+
SWIFT_RUNTIME_STDLIB_INTERNAL
300+
const long long $sSrMn[1] = {0};
301+
302+
// UnsafeBufferPointer
303+
304+
SWIFT_RUNTIME_STDLIB_INTERNAL
305+
const long long $sSRMn[1] = {0};
306+
307+
// String
308+
309+
SWIFT_RUNTIME_STDLIB_INTERNAL
310+
const long long $sSSMn[1] = {0};
311+
312+
// Sequence
313+
314+
SWIFT_RUNTIME_STDLIB_INTERNAL
315+
const long long $sSTMp[1] = {0};
316+
317+
// UInt
318+
319+
SWIFT_RUNTIME_STDLIB_INTERNAL
320+
const long long $sSuMn[1] = {0};
321+
322+
// UnsignedInteger
323+
324+
SWIFT_RUNTIME_STDLIB_INTERNAL
325+
const long long $sSUMp[1] = {0};
326+
327+
// UnsafeMutableRawPointer
328+
329+
SWIFT_RUNTIME_STDLIB_INTERNAL
330+
const long long $sSvMn[1] = {0};
331+
332+
// Strideable
333+
334+
SWIFT_RUNTIME_STDLIB_INTERNAL
335+
const long long $sSxMp[1] = {0};
336+
337+
// RangeExpression
338+
339+
SWIFT_RUNTIME_STDLIB_INTERNAL
340+
const long long $sSXMp[1] = {0};
341+
342+
// StringProtocol
343+
344+
SWIFT_RUNTIME_STDLIB_INTERNAL
345+
const long long $sSyMp[1] = {0};
346+
347+
// RawRepresentable
348+
349+
SWIFT_RUNTIME_STDLIB_INTERNAL
350+
const long long $sSYMp[1] = {0};
351+
352+
// BinaryInteger
353+
354+
SWIFT_RUNTIME_STDLIB_INTERNAL
355+
const long long $sSzMp[1] = {0};
356+
357+
// Decodable
358+
359+
SWIFT_RUNTIME_STDLIB_INTERNAL
360+
const long long $sSeMp[1] = {0};
361+
362+
// Encodable
363+
364+
SWIFT_RUNTIME_STDLIB_INTERNAL
365+
const long long $sSEMp[1] = {0};
366+
367+
// Float
368+
369+
SWIFT_RUNTIME_STDLIB_INTERNAL
370+
const long long $sSfMn[1] = {0};
371+
372+
// FloatingPoint
373+
374+
SWIFT_RUNTIME_STDLIB_INTERNAL
375+
const long long $sSFMp[1] = {0};
376+
377+
// Collection
378+
379+
SWIFT_RUNTIME_STDLIB_INTERNAL
380+
const long long $sSlMp[1] = {0};
381+
382+
// Comparable
383+
384+
SWIFT_RUNTIME_STDLIB_INTERNAL
385+
const long long $sSLMp[1] = {0};
386+
387+
// UnsafePointer
388+
389+
SWIFT_RUNTIME_STDLIB_INTERNAL
390+
const long long $sSPMn[1] = {0};
391+
392+
// Substring
393+
394+
SWIFT_RUNTIME_STDLIB_INTERNAL
395+
const long long $sSsMn[1] = {0};
396+
397+
// IteratorProtocol
398+
399+
SWIFT_RUNTIME_STDLIB_INTERNAL
400+
const long long $sStMp[1] = {0};
401+
402+
// UnsafeRawPointer
403+
404+
SWIFT_RUNTIME_STDLIB_INTERNAL
405+
const long long $sSVMn[1] = {0};
406+
407+
// UnsafeMutableRawBufferPointer
408+
409+
SWIFT_RUNTIME_STDLIB_INTERNAL
410+
const long long $sSwMn[1] = {0};
411+
412+
// UnsafeRawBufferPointer
413+
414+
SWIFT_RUNTIME_STDLIB_INTERNAL
415+
const long long $sSWMn[1] = {0};
416+
417+
// SignedInteger
418+
419+
SWIFT_RUNTIME_STDLIB_INTERNAL
420+
const long long $sSZMp[1] = {0};
421+
207422
// Mirror
208423

209424
// protocol witness table for Swift._ClassSuperMirror : Swift._Mirror in Swift

0 commit comments

Comments
 (0)