Skip to content

Commit e5d056d

Browse files
committed
Remove unnecessary member
1 parent 1d25188 commit e5d056d

File tree

2 files changed

+6
-11
lines changed

2 files changed

+6
-11
lines changed

src/coreclr/debug/daccess/cdac.cpp

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
#include <stdio.h>
5-
#include <minipal/utils.h>
4+
#include "cdac.h"
65
#include <sospriv.h>
76
#include <sstring.h>
8-
#include <clrhost.h>
97
#include "dbgutil.h"
10-
#include "cdac.h"
118

129
#define CDAC_LIB_NAME MAKEDLLNAME_W(W("cdacreader"))
1310

@@ -49,12 +46,13 @@ CDAC::CDAC(HMODULE module, uint64_t descriptorAddr, ICorDebugDataTarget* target)
4946
: m_module(module)
5047
, m_target{target}
5148
{
52-
m_init = reinterpret_cast<decltype(&cdac_reader_init)>(::GetProcAddress(m_module, "cdac_reader_init"));
49+
decltype(&cdac_reader_init) init = reinterpret_cast<decltype(&cdac_reader_init)>(::GetProcAddress(m_module, "cdac_reader_init"));
50+
decltype(&cdac_reader_get_sos_interface) getSosInterface = reinterpret_cast<decltype(&cdac_reader_get_sos_interface)>(::GetProcAddress(m_module, "cdac_reader_get_sos_interface"));
5351
m_free = reinterpret_cast<decltype(&cdac_reader_free)>(::GetProcAddress(m_module, "cdac_reader_free"));
54-
m_getSosInterface = reinterpret_cast<decltype(&cdac_reader_get_sos_interface)>(::GetProcAddress(m_module, "cdac_reader_get_sos_interface"));
52+
_ASSERTE(init != nullptr && getSosInterface != nullptr && m_free != nullptr);
5553

56-
m_init(descriptorAddr, &ReadFromTargetCallback, this, &m_cdac_handle);
57-
m_getSosInterface(m_cdac_handle, &m_sos);
54+
init(descriptorAddr, &ReadFromTargetCallback, this, &m_cdac_handle);
55+
getSosInterface(m_cdac_handle, &m_sos);
5856
}
5957

6058
CDAC::~CDAC()

src/coreclr/debug/daccess/cdac.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#define CDAC_H
66

77
#include <cdac_reader.h>
8-
#include <holder.h>
98

109
class CDAC final
1110
{
@@ -27,9 +26,7 @@ class CDAC final
2726
NonVMComHolder<IUnknown> m_sos;
2827

2928
private:
30-
decltype(&cdac_reader_init) m_init;
3129
decltype(&cdac_reader_free) m_free;
32-
decltype(&cdac_reader_get_sos_interface) m_getSosInterface;
3330
};
3431

3532
#endif // CDAC_H

0 commit comments

Comments
 (0)