projects
/
platform
/
upstream
/
dotnet
/
runtime.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cb8733f
)
Fix a build break.
author
Pat Gavlin
<pagavlin@microsoft.com>
Fri, 29 Jul 2016 18:58:10 +0000
(11:58 -0700)
committer
Pat Gavlin
<pagavlin@microsoft.com>
Fri, 29 Jul 2016 18:58:10 +0000
(11:58 -0700)
[tfs-changeset: 1619855]
Commit migrated from https://github.com/dotnet/coreclr/commit/
ca240d9368dca4fb19f34cc754bca8a642addcd7
src/coreclr/src/jit/importer.cpp
patch
|
blob
|
history
diff --git
a/src/coreclr/src/jit/importer.cpp
b/src/coreclr/src/jit/importer.cpp
index
aa63b8f
..
3bbb3c2
100644
(file)
--- a/
src/coreclr/src/jit/importer.cpp
+++ b/
src/coreclr/src/jit/importer.cpp
@@
-11736,12
+11736,14
@@
DO_LDFTN:
// At present this can only be String
else if (clsFlags & CORINFO_FLG_VAROBJSIZE)
{
+#if COR_JIT_EE_VERSION > 460
if (eeGetEEInfo()->targetAbi == CORINFO_CORERT_ABI)
{
// The dummy argument does not exist in CoreRT
newObjThisPtr = nullptr;
}
else
+#endif
{
// This is the case for variable-sized objects that are not
// arrays. In this case, call the constructor with a null 'this'