summaryrefslogtreecommitdiff
path: root/src/vm
diff options
context:
space:
mode:
authorPetr Bred <bredpetr@gmail.com>2017-05-26 17:17:05 +0300
committerJan Kotas <jkotas@microsoft.com>2017-05-26 07:17:05 -0700
commit8a934c90711e0d1a915e309941a34db832395076 (patch)
tree0671ade34b3fb81fa373e6017c9ede19521cdc1c /src/vm
parent3613e93bb364a82efa1a0d0b82c89b996b043c52 (diff)
downloadcoreclr-8a934c90711e0d1a915e309941a34db832395076.tar.gz
coreclr-8a934c90711e0d1a915e309941a34db832395076.tar.bz2
coreclr-8a934c90711e0d1a915e309941a34db832395076.zip
Fix compile with disabled FEATURE_READYTORUN option (#11875)
- just remove FEATURE_READYTORUN definitions in clrdefinitions.cmake to turn off option Signed-off-by: Petr Bred <bredpetr@gmail.com>
Diffstat (limited to 'src/vm')
-rw-r--r--src/vm/ceeload.cpp2
-rw-r--r--src/vm/compile.cpp2
-rw-r--r--src/vm/compile.h2
-rw-r--r--src/vm/eventpipe.cpp2
-rw-r--r--src/vm/eventpipe.h2
-rw-r--r--src/vm/eventpipeconfiguration.cpp2
-rw-r--r--src/vm/eventpipeconfiguration.h2
7 files changed, 10 insertions, 4 deletions
diff --git a/src/vm/ceeload.cpp b/src/vm/ceeload.cpp
index 367819e67a..ef56342e25 100644
--- a/src/vm/ceeload.cpp
+++ b/src/vm/ceeload.cpp
@@ -467,6 +467,7 @@ void Module::InitializeForProfiling()
}
else // ReadyToRun image
{
+#ifdef FEATURE_READYTORUN_COMPILER
// We already setup the m_methodProfileList in the ReadyToRunInfo constructor
if (m_methodProfileList != nullptr)
{
@@ -476,6 +477,7 @@ void Module::InitializeForProfiling()
// Enable profiling if the ZapBBInstr value says to
m_nativeImageProfiling = GetAssembly()->IsInstrumented();
}
+#endif
}
#ifdef FEATURE_LAZY_COW_PAGES
diff --git a/src/vm/compile.cpp b/src/vm/compile.cpp
index c24c3f2b8a..49b329e295 100644
--- a/src/vm/compile.cpp
+++ b/src/vm/compile.cpp
@@ -6826,11 +6826,13 @@ ULONG CEEPreloader::Release()
return 0;
}
+#ifdef FEATURE_READYTORUN_COMPILER
void CEEPreloader::GetSerializedInlineTrackingMap(SBuffer* pBuffer)
{
InlineTrackingMap * pInlineTrackingMap = m_image->GetInlineTrackingMap();
PersistentInlineTrackingMapR2R::Save(m_image->GetHeap(), pBuffer, pInlineTrackingMap);
}
+#endif
void CEEPreloader::Error(mdToken token, Exception * pException)
{
diff --git a/src/vm/compile.h b/src/vm/compile.h
index 5d4aff755f..8618b01215 100644
--- a/src/vm/compile.h
+++ b/src/vm/compile.h
@@ -654,7 +654,9 @@ public:
ULONG Release();
+#ifdef FEATURE_READYTORUN_COMPILER
void GetSerializedInlineTrackingMap(SBuffer* pBuffer);
+#endif
void Error(mdToken token, Exception * pException);
};
diff --git a/src/vm/eventpipe.cpp b/src/vm/eventpipe.cpp
index 4eae6a87c6..9a94923493 100644
--- a/src/vm/eventpipe.cpp
+++ b/src/vm/eventpipe.cpp
@@ -107,7 +107,7 @@ void EventPipe::Shutdown()
void EventPipe::Enable(
LPCWSTR strOutputPath,
- uint circularBufferSizeInMB,
+ unsigned int circularBufferSizeInMB,
EventPipeProviderConfiguration *pProviders,
int numProviders)
{
diff --git a/src/vm/eventpipe.h b/src/vm/eventpipe.h
index a69e1ba840..fa7d734280 100644
--- a/src/vm/eventpipe.h
+++ b/src/vm/eventpipe.h
@@ -170,7 +170,7 @@ class EventPipe
// Enable tracing via the event pipe.
static void Enable(
LPCWSTR strOutputPath,
- uint circularBufferSizeInMB,
+ unsigned int circularBufferSizeInMB,
EventPipeProviderConfiguration *pProviders,
int numProviders);
diff --git a/src/vm/eventpipeconfiguration.cpp b/src/vm/eventpipeconfiguration.cpp
index 42f9daf528..0a266e4849 100644
--- a/src/vm/eventpipeconfiguration.cpp
+++ b/src/vm/eventpipeconfiguration.cpp
@@ -207,7 +207,7 @@ void EventPipeConfiguration::SetCircularBufferSize(size_t circularBufferSize)
}
void EventPipeConfiguration::Enable(
- uint circularBufferSizeInMB,
+ unsigned int circularBufferSizeInMB,
EventPipeProviderConfiguration *pProviders,
int numProviders)
{
diff --git a/src/vm/eventpipeconfiguration.h b/src/vm/eventpipeconfiguration.h
index de8e79d2f3..aac9bd6065 100644
--- a/src/vm/eventpipeconfiguration.h
+++ b/src/vm/eventpipeconfiguration.h
@@ -52,7 +52,7 @@ public:
// Enable the event pipe.
void Enable(
- uint circularBufferSizeInMB,
+ unsigned int circularBufferSizeInMB,
EventPipeProviderConfiguration *pProviders,
int numProviders);