Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Merge changes from TFS #267

Merged
jkotas merged 1 commit into from
Feb 14, 2015
+5 −4
Merged

Merge changes from TFS #267

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/debug/di/process.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9742,9 +9742,10 @@ void CordbProcess::MarshalManagedEvent(DebuggerIPCEvent * pManagedEvent)
// The event still needs to be Marshaled before being used. (see code:CordbProcess::MarshalManagedEvent)
//
//---------------------------------------------------------------------------------------
#ifdef _TARGET_ARM_
// This is a temporary workaround for an ARM specific C++ compiler bug.
// It should be removed once the bug is fixed.
#if defined(_MSC_VER) && defined(_TARGET_ARM_)
// This is a temporary workaround for an ARM specific MS C++ compiler bug (internal LKG build 18.1).
// Branch < if (ptrRemoteManagedEvent == NULL) > was always taken and the function always returned false.
// TODO: It should be removed once the bug is fixed.
#pragma optimize("", off)
#endif
bool CordbProcess::CopyManagedEventFromTarget(
Expand Down Expand Up @@ -9793,7 +9794,7 @@ bool CordbProcess::CopyManagedEventFromTarget(

return true;
}
#ifdef _TARGET_ARM_
#if defined(_MSC_VER) && defined(_TARGET_ARM_)
#pragma optimize("", on)
#endif

Expand Down