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

Commit fcdc1ec

Browse files
safernsafern
committed
Open branch for new changes and merge older ones
2 parents 44b7f6d + b5c6996 commit fcdc1ec

File tree

13 files changed

+128
-27
lines changed

13 files changed

+128
-27
lines changed

‎dependencies.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<PropertyGroup>
1414
<!-- Central place to set the versions of all nuget packages produced in the repo -->
15-
<PackageVersion Condition="'$(PackageVersion)' == ''">2.0.5</PackageVersion>
15+
<PackageVersion Condition="'$(PackageVersion)' == ''">2.0.6</PackageVersion>
1616

1717
<!-- Set the boolean below to true to generate packages with stabilized versions -->
1818
<StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">false</StabilizePackageVersion>

‎perf.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ def static getFullPerfJobName(def project, def os, def isPR) {
264264
}
265265

266266
// Actual perf testing on the following OSes
267-
def perfOSList = ['Ubuntu14.04']
267+
def perfOSList = ['Ubuntu16.04']
268268
perfOSList.each { os ->
269269
def newJob = job(getFullPerfJobName(project, os, isPR)) {
270270

@@ -403,7 +403,7 @@ def static getFullThroughputJobName(def project, def os, def isPR) {
403403
}
404404

405405
// Actual perf testing on the following OSes
406-
def throughputOSList = ['Ubuntu14.04']
406+
def throughputOSList = ['Ubuntu16.04']
407407
def throughputOptLevelList = ['full_opt', 'min_opt']
408408

409409
def throughputOSOptLevelList = []

‎src/.nuget/Microsoft.NETCore.Jit/Microsoft.NETCore.Jit.pkgproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<LongNamePlatform Condition="'$(LongNamePlatform)'=='x64'">amd64</LongNamePlatform>
1212
<CrossTargetPlatform>$(CrossTargetComponentFolder)</CrossTargetPlatform>
1313
<CrossTargetPlatform Condition="'$(CrossTargetPlatform)'=='x64'">amd64</CrossTargetPlatform>
14-
<LongNameSuffix>_$(LongNamePlatform)_$(LongNamePlatform)_$(MajorVersion).$(MinorVersion).$(BuildNumberMajor).0$(BuildNumberMinor)</LongNameSuffix>
15-
<CrossTargetLongNameSuffix>_$(CrossTargetPlatform)_$(LongNamePlatform)_$(MajorVersion).$(MinorVersion).$(BuildNumberMajor).0$(BuildNumberMinor)</CrossTargetLongNameSuffix>
14+
<LongNameSuffix>_$(LongNamePlatform)_$(LongNamePlatform)_$(MajorVersion).$(MinorVersion).$(BuildNumberMajor).$(BuildNumberMinor)</LongNameSuffix>
15+
<CrossTargetLongNameSuffix>_$(CrossTargetPlatform)_$(LongNamePlatform)_$(MajorVersion).$(MinorVersion).$(BuildNumberMajor).$(BuildNumberMinor)</CrossTargetLongNameSuffix>
1616
</PropertyGroup>
1717

1818
<Import Condition="'$(_packageTargetOSGroup)' != ''" Project="$(MSBuildThisFileDirectory)runtime.$(_packageTargetOSGroup).$(MSBuildProjectName).props" />

‎src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/runtime.Windows_NT.Microsoft.NETCore.Runtime.CoreCLR.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<LongNamePlatform Condition="'$(Platform)'=='x64'">amd64</LongNamePlatform>
77
<CrossTargetPlatform>$(CrossTargetComponentFolder)</CrossTargetPlatform>
88
<CrossTargetPlatform Condition="'$(CrossTargetPlatform)'=='x64'">amd64</CrossTargetPlatform>
9-
<LongNameSuffix>_$(LongNamePlatform)_$(LongNamePlatform)_$(MajorVersion).$(MinorVersion).$(BuildNumberMajor).0$(BuildNumberMinor)</LongNameSuffix>
10-
<CrossTargetLongNameSuffix>_$(CrossTargetPlatform)_$(LongNamePlatform)_$(MajorVersion).$(MinorVersion).$(BuildNumberMajor).0$(BuildNumberMinor)</CrossTargetLongNameSuffix>
9+
<LongNameSuffix>_$(LongNamePlatform)_$(LongNamePlatform)_$(MajorVersion).$(MinorVersion).$(BuildNumberMajor).$(BuildNumberMinor)</LongNameSuffix>
10+
<CrossTargetLongNameSuffix>_$(CrossTargetPlatform)_$(LongNamePlatform)_$(MajorVersion).$(MinorVersion).$(BuildNumberMajor).$(BuildNumberMinor)</CrossTargetLongNameSuffix>
1111
</PropertyGroup>
1212

1313
<ItemGroup>

‎src/jit/morph.cpp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15667,7 +15667,13 @@ bool Compiler::fgMorphBlockStmt(BasicBlock* block, GenTreeStmt* stmt DEBUGARG(co
1566715667
}
1566815668

1566915669
// Can the entire tree be removed?
15670-
bool removedStmt = fgCheckRemoveStmt(block, stmt);
15670+
bool removedStmt = false;
15671+
15672+
// Defer removing statements during CSE so we don't inadvertently remove any CSE defs.
15673+
if (!optValnumCSE_phase)
15674+
{
15675+
removedStmt = fgCheckRemoveStmt(block, stmt);
15676+
}
1567115677

1567215678
// Or this is the last statement of a conditional branch that was just folded?
1567315679
if (!removedStmt && (stmt->getNextStmt() == nullptr) && !fgRemoveRestOfBlock)

‎src/mscorlib/shared/System/EventArgs.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
namespace System
88
{
99
// The base class for all event classes.
10+
[Serializable]
11+
[System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
1012
public class EventArgs
1113
{
1214
public static readonly EventArgs Empty = new EventArgs();

‎src/vm/ceeload.cpp‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3893,27 +3893,31 @@ ISymUnmanagedReader *Module::GetISymUnmanagedReader(void)
38933893
// We've got in-memory ILDB symbols, create the ILDB symbol binder
38943894
// Note that in this case, we must be very careful not to use diasymreader.dll
38953895
// at all - we don't trust it, and shouldn't run any code in it
3896-
IfFailThrow(IldbSymbolsCreateInstance(CLSID_CorSymBinder_SxS,
3897-
IID_ISymUnmanagedBinder,
3898-
(void**)&pBinder));
3896+
IfFailThrow(IldbSymbolsCreateInstance(CLSID_CorSymBinder_SxS, IID_ISymUnmanagedBinder, (void**)&pBinder));
38993897
}
39003898
else
39013899
{
3902-
// We're going to be working with PDB format symbols
3903-
// Attempt to coCreate the symbol binder.
3904-
// CoreCLR supports not having a symbol reader installed, so this is expected there.
3900+
// We're going to be working with Windows PDB format symbols. Attempt to CoCreate the symbol binder.
3901+
// CoreCLR supports not having a symbol reader installed, so CoCreate searches the PATH env var
3902+
// and then tries coreclr dll location.
39053903
// On desktop, the framework installer is supposed to install diasymreader.dll as well
39063904
// and so this shouldn't happen.
3907-
hr = FakeCoCreateInstanceEx(CLSID_CorSymBinder_SxS,
3908-
NATIVE_SYMBOL_READER_DLL,
3909-
IID_ISymUnmanagedBinder,
3910-
(void**)&pBinder,
3911-
NULL);
3905+
hr = FakeCoCreateInstanceEx(CLSID_CorSymBinder_SxS, NATIVE_SYMBOL_READER_DLL, IID_ISymUnmanagedBinder, (void**)&pBinder, NULL);
39123906
if (FAILED(hr))
39133907
{
3914-
RETURN (NULL);
3908+
PathString symbolReaderPath;
3909+
hr = GetHModuleDirectory(GetModuleInst(), symbolReaderPath);
3910+
if (FAILED(hr))
3911+
{
3912+
RETURN (NULL);
3913+
}
3914+
symbolReaderPath.Append(NATIVE_SYMBOL_READER_DLL);
3915+
hr = FakeCoCreateInstanceEx(CLSID_CorSymBinder_SxS, symbolReaderPath.GetUnicode(), IID_ISymUnmanagedBinder, (void**)&pBinder, NULL);
3916+
if (FAILED(hr))
3917+
{
3918+
RETURN (NULL);
3919+
}
39153920
}
3916-
39173921
}
39183922

39193923
LOG((LF_CORDB, LL_INFO10, "M::GISUR: Created binder\n"));

‎src/vm/clrex.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1224,7 +1224,7 @@ OBJECTREF EEException::CreateThrowable()
12241224
#endif
12251225
}
12261226

1227-
RuntimeExceptionKind EEException::GetKindFromHR(HRESULT hr, bool fIsWinRtMode)
1227+
RuntimeExceptionKind EEException::GetKindFromHR(HRESULT hr, bool fIsWinRtMode /*= false*/)
12281228
{
12291229
LIMITED_METHOD_CONTRACT;
12301230

‎src/vm/clrex.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ inline EEMessageException::EEMessageException(HRESULT hr)
10961096
}
10971097

10981098
inline EEMessageException::EEMessageException(HRESULT hr, bool fUseCOMException)
1099-
: EEException(GetKindFromHR(hr, fUseCOMException)),
1099+
: EEException(GetKindFromHR(hr, !fUseCOMException)),
11001100
m_hr(hr),
11011101
m_resID(0)
11021102
{

‎src/vm/stubhelpers.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1691,7 +1691,7 @@ FCIMPL4(Object*, StubHelpers::GetCOMHRExceptionObject, HRESULT hr, MethodDesc *p
16911691
}
16921692
}
16931693

1694-
GetExceptionForHR(hr, pErrInfo, fForWinRT, &oThrowable, pResErrorInfo, bHasNonCLRLanguageErrorObject);
1694+
GetExceptionForHR(hr, pErrInfo, !fForWinRT, &oThrowable, pResErrorInfo, bHasNonCLRLanguageErrorObject);
16951695
}
16961696
HELPER_METHOD_FRAME_END();
16971697

0 commit comments

Comments
 (0)