Skip to content

Commit d52c4f1

Browse files
Rebase fix
1 parent d016500 commit d52c4f1

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

tracer/src/Datadog.Tracer.Native/iast/dataflow.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,8 @@ AspectFilter* ModuleAspects::GetFilter(DataflowAspectFilterValue filterValue)
158158

159159
//--------------------
160160

161-
Dataflow::Dataflow(ICorProfilerInfo* profiler,
162-
std::shared_ptr<RejitHandler> rejitHandler,
163-
std::vector<ModuleID> moduleIds,
164-
const RuntimeInformation& runtimeInfo) :
161+
Dataflow::Dataflow(ICorProfilerInfo* profiler, std::shared_ptr<RejitHandler> rejitHandler,
162+
std::vector<ModuleID> moduleIds, const RuntimeInformation& runtimeInfo) :
165163
Rejitter(rejitHandler, RejitterPriority::Low, false)
166164
{
167165
m_runtimeType = runtimeInfo.runtime_type;
@@ -171,17 +169,21 @@ Dataflow::Dataflow(ICorProfilerInfo* profiler,
171169
this->_setILOnJit = trace::IsEditAndContinueEnabled();
172170
if (this->_setILOnJit)
173171
{
174-
trace::Logger::Info("Dataflow detected Edit and Continue feature (COMPLUS_ForceEnc != 0) : Enabling SetILCode in JIT event.");
172+
trace::Logger::Info(
173+
"Dataflow detected Edit and Continue feature (COMPLUS_ForceEnc != 0) : Enabling SetILCode in JIT event.");
175174
}
176175

177176
HRESULT hr = profiler->QueryInterface(__uuidof(ICorProfilerInfo3), (void**) &_profiler);
178177
if (FAILED(hr))
179178
{
180179
_profiler = nullptr;
181-
trace::Logger::Error("Dataflow::Dataflow -> Something very wrong happened, as QI on ICorProfilerInfo3 failed. Disabling Dataflow. HRESULT : ", Hex(hr));
180+
trace::Logger::Error("Dataflow::Dataflow -> Something very wrong happened, as QI on ICorProfilerInfo3 failed. "
181+
"Disabling Dataflow. HRESULT : ",
182+
Hex(hr));
182183
}
183184

184185
_preLoadedModuleIds = moduleIds;
186+
}
185187

186188
Dataflow::~Dataflow()
187189
{
@@ -382,8 +384,6 @@ HRESULT Dataflow::AppDomainShutdown(AppDomainID appDomainId)
382384

383385
HRESULT Dataflow::ModuleLoaded(ModuleID moduleId, ModuleInfo** pModuleInfo)
384386
{
385-
ENTER_FUNC
386-
387387
// Retrieve all already modules at once to mimic initialization from creation behavior
388388
if (_preLoadedModuleIds.size() > 0)
389389
{

0 commit comments

Comments
 (0)