Skip to content

Commit 47ef3c4

Browse files
committed
fix IDL for oopjit
the padding causes mismatch between the runtime and marshalling layer
1 parent 224e603 commit 47ef3c4

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

lib/Backend/Backend.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,6 @@ enum IRDumpFlags
110110
// BackEnd includes
111111
//
112112

113-
#ifdef _WIN32
114-
#include "../JITIDL/JITTypes.h"
115-
#endif
116113
#include "JITTimeProfileInfo.h"
117114
#include "JITRecyclableObject.h"
118115
#include "JITTimeFixedField.h"

lib/JITIDL/JITTypes.h

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,23 +33,17 @@ import "wtypes.idl";
3333
#define IDL_DEF(def)
3434
#endif
3535

36-
#if defined(__midl)
3736
#define IDL_PAD1(num) byte struct_pad_##num;
3837
#define IDL_PAD2(num) short struct_pad_##num;
3938
#define IDL_PAD4(num) int struct_pad_##num;
40-
#else
41-
#define IDL_PAD1(num)
42-
#define IDL_PAD2(num)
43-
#define IDL_PAD4(num)
44-
#endif
4539

46-
#if defined(__midl) && (defined(_M_X64) || defined(_M_ARM64))
40+
#if defined(_M_X64) || defined(_M_ARM64)
4741
#define X64_PAD4(num) int struct_pad_##num;
4842
#else
4943
#define X64_PAD4(num)
5044
#endif
5145

52-
#if defined(__midl) && (defined(_M_IX86) || defined(_M_ARM))
46+
#if defined(_M_IX86) || defined(_M_ARM)
5347
#define X86_PAD4(num) int struct_pad_##num;
5448
#else
5549
#define X86_PAD4(num)

0 commit comments

Comments
 (0)