Skip to content

Commit da60fb6

Browse files
committed
[MERGE #2438 @obastemur] xplat: do not inline class function in source file
Merge pull request #2438 from obastemur:inline_opt - Fixes clang/homebrew '-Os' build breaks - Remove unused definition from CMakeLists
2 parents 404eb5f + 7679dea commit da60fb6

File tree

7 files changed

+9
-18
lines changed

7 files changed

+9
-18
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ if(CC_EMBED_ICU_SH)
9090
unset(CC_EMBED_ICU_SH CACHE)
9191
set(CC_EMBED_ICU 1)
9292
set(ICU_INCLUDE_PATH "deps/icu/source/output/include/")
93-
add_definitions(-DU_STATIC_IMPLEMENTATION)
9493
endif()
9594

9695
if(ICU_INCLUDE_PATH_SH)

lib/Backend/IRBuilderAsmJs.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -943,7 +943,7 @@ IRBuilderAsmJs::BuildArgInTracing()
943943
int32 doubleArgInCount = 0;
944944
int32 simd128ArgInCount = 0;
945945

946-
Js::ArgSlot nArgs = 0;
946+
Js::ArgSlot nArgs = 0;
947947
if (m_func->GetJITFunctionBody()->HasImplicitArgIns())
948948
{
949949
// -1 to remove the implicit this pointer
@@ -3260,7 +3260,7 @@ IRBuilderAsmJs::BuildLong1Double1(Js::OpCodeAsmJs newOpcode, uint32 offset, Js::
32603260
{
32613261
IR::RegOpnd * srcOpnd = BuildSrcOpnd(src1RegSlot, TyFloat64);
32623262
srcOpnd->SetValueType(ValueType::Float);
3263-
3263+
32643264
IRType dstType;
32653265
Js::OpCode op;
32663266
bool doTruncTrapCheck = false;
@@ -3536,7 +3536,7 @@ IR::Instr* IRBuilderAsmJs::GenerateStSlotForReturn(IR::RegOpnd* srcOpnd, IRType
35363536
return stSlotInstr;
35373537
}
35383538

3539-
inline Js::OpCode IRBuilderAsmJs::GetSimdOpcode(Js::OpCodeAsmJs asmjsOpcode)
3539+
Js::OpCode IRBuilderAsmJs::GetSimdOpcode(Js::OpCodeAsmJs asmjsOpcode)
35403540
{
35413541
Js::OpCode opcode = (Js::OpCode) 0;
35423542
Assert(IsSimd128AsmJsOpcode(asmjsOpcode));
@@ -5505,7 +5505,7 @@ IRBuilderAsmJs::BuildUint16x8_1Uint8x16_1(Js::OpCodeAsmJs newOpcode, uint32 offs
55055505
void IRBuilderAsmJs::BuildUint8x16_1Int16(Js::OpCodeAsmJs newOpcode, uint32 offset, BUILD_SIMD_ARGS_REG17)
55065506
{
55075507
AssertMsg(newOpcode == Js::OpCodeAsmJs::Simd128_IntsToU16, "Unexpected opcode for this format.");
5508-
5508+
55095509
uint const LANES = 16;
55105510
Js::RegSlot srcRegSlots[LANES];
55115511

lib/Backend/InterpreterThunkEmitter.cpp

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ void InterpreterThunkEmitter::NewThunkBlock()
304304
BYTE* buffer;
305305

306306
EmitBufferAllocation<VirtualAllocWrapper, PreReservedVirtualAllocWrapper> * allocation = emitBufferManager.AllocateBuffer(BlockSize, &buffer);
307-
if (allocation == nullptr)
307+
if (allocation == nullptr)
308308
{
309309
Js::Throw::OutOfMemory();
310310
}
@@ -683,9 +683,7 @@ void InterpreterThunkEmitter::EncodeInterpreterThunk(
683683
}
684684
#endif
685685

686-
687-
688-
inline /*static*/
686+
/*static*/
689687
DWORD InterpreterThunkEmitter::FillDebugBreak(_Out_writes_bytes_all_(count) BYTE* dest, _In_ DWORD count)
690688
{
691689
#if defined(_M_ARM)
@@ -697,9 +695,7 @@ DWORD InterpreterThunkEmitter::FillDebugBreak(_Out_writes_bytes_all_(count) BYTE
697695
return count;
698696
}
699697

700-
701-
702-
inline /*static*/
698+
/*static*/
703699
DWORD InterpreterThunkEmitter::CopyWithAlignment(
704700
_Out_writes_bytes_all_(sizeInBytes) BYTE* dest,
705701
_In_ const DWORD sizeInBytes,
@@ -876,4 +872,3 @@ bool ThunkBlock::IsFreeListEmpty() const
876872
}
877873

878874
#endif
879-

lib/Parser/CharSet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ namespace UnifiedRegex
196196
// CharSetNode
197197
// ----------------------------------------------------------------------
198198

199-
inline CharSetNode* CharSetNode::For(ArenaAllocator* allocator, int level)
199+
CharSetNode* CharSetNode::For(ArenaAllocator* allocator, int level)
200200
{
201201
if (level == 0)
202202
return Anew(allocator, CharSetLeaf);

lib/Runtime/Library/JavascriptString.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ namespace Js
403403
}
404404
}
405405

406-
inline JavascriptString* JavascriptString::ConcatDestructive(JavascriptString* pstRight)
406+
JavascriptString* JavascriptString::ConcatDestructive(JavascriptString* pstRight)
407407
{
408408
Assert(pstRight);
409409

pal/src/config.h.in

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
#cmakedefine01 HAVE_SYS_TIME_H
1212
#cmakedefine01 HAVE_PTHREAD_NP_H
1313
#cmakedefine01 HAVE_SYS_LWP_H
14-
#cmakedefine01 HAVE_LIBUUID_H
15-
#cmakedefine01 HAVE_BSD_UUID_H
1614
#cmakedefine01 HAVE_RUNETYPE_H
1715

1816
#cmakedefine01 HAVE_KQUEUE

pal/src/configure.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,6 @@ else() # ANDROID
916916
set(HAVE_SYS_TIME_H 1)
917917
set(HAVE_PTHREAD_NP_H 0)
918918
set(HAVE_SYS_LWP_H 0)
919-
set(HAVE_LIBUUID_H 1)
920919
set(HAVE_RUNETYPE_H 0)
921920
set(HAVE_KQUEUE 0)
922921
set(HAVE_GETPWUID_R 1)

0 commit comments

Comments
 (0)