Commit 0feedebf authored by Jonas Devlieghere's avatar Jonas Devlieghere
Browse files

[lldb/Plugin] Rename AddressSanitizerRuntime for consistency with plugin (NFC) 

Renames AddressSanitizerRuntime to InstrumentationRuntimeASan to be
consistent with the directory structure and plugin name.
parent 83a131b2

lldb/source/API/SystemInitializerFull.cpp

+3 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
#include "Plugins/Instruction/MIPS/EmulateInstructionMIPS.h"

#include "Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h"

#include "Plugins/Instruction/PPC64/EmulateInstructionPPC64.h"

#include "Plugins/InstrumentationRuntime/ASan/ASanRuntime.h"

#include "Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.h"

#include "Plugins/InstrumentationRuntime/MainThreadChecker/MainThreadCheckerRuntime.h"

#include "Plugins/InstrumentationRuntime/TSan/TSanRuntime.h"

#include "Plugins/InstrumentationRuntime/UBSan/UBSanRuntime.h"
@@ -222,7 +222,7 @@ llvm::Error SystemInitializerFull::Initialize() { 
  ProcessMachCore::Initialize();

  minidump::ProcessMinidump::Initialize();

  MemoryHistoryASan::Initialize();

  AddressSanitizerRuntime::Initialize();

  InstrumentationRuntimeASan::Initialize();

  ThreadSanitizerRuntime::Initialize();

  UndefinedBehaviorSanitizerRuntime::Initialize();

  MainThreadCheckerRuntime::Initialize();
@@ -316,7 +316,7 @@ void SystemInitializerFull::Terminate() { 
  ProcessMachCore::Terminate();

  minidump::ProcessMinidump::Terminate();

  MemoryHistoryASan::Terminate();

  AddressSanitizerRuntime::Terminate();

  InstrumentationRuntimeASan::Terminate();

  ThreadSanitizerRuntime::Terminate();

  UndefinedBehaviorSanitizerRuntime::Terminate();

  MainThreadCheckerRuntime::Terminate();

lldb/source/Plugins/InstrumentationRuntime/ASan/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line 
add_lldb_library(lldbPluginInstrumentationRuntimeASan PLUGIN

  ASanRuntime.cpp

  InstrumentationRuntimeASan.cpp



  LINK_LIBS

    lldbBreakpoint

lldb/source/Plugins/InstrumentationRuntime/ASan/ASanRuntime.cpp→lldb/source/Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.cpp

+19 −19
Original line number Diff line number Diff line 
//===-- ASanRuntime.cpp -----------------------------------------*- C++ -*-===//

//===-- InstrumentationRuntimeASan.cpp --------------------------*- C++ -*-===//

//

// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

// See https://llvm.org/LICENSE.txt for license information.
@@ -6,7 +6,7 @@ 
//

//===----------------------------------------------------------------------===//



#include "ASanRuntime.h"

#include "InstrumentationRuntimeASan.h"



#include "lldb/Breakpoint/StoppointCallbackContext.h"

#include "lldb/Core/Debugger.h"
@@ -31,39 +31,39 @@ using namespace lldb; 
using namespace lldb_private;



lldb::InstrumentationRuntimeSP

AddressSanitizerRuntime::CreateInstance(const lldb::ProcessSP &process_sp) {

  return InstrumentationRuntimeSP(new AddressSanitizerRuntime(process_sp));

InstrumentationRuntimeASan::CreateInstance(const lldb::ProcessSP &process_sp) {

  return InstrumentationRuntimeSP(new InstrumentationRuntimeASan(process_sp));

}



void AddressSanitizerRuntime::Initialize() {

void InstrumentationRuntimeASan::Initialize() {

  PluginManager::RegisterPlugin(

      GetPluginNameStatic(), "AddressSanitizer instrumentation runtime plugin.",

      CreateInstance, GetTypeStatic);

}



void AddressSanitizerRuntime::Terminate() {

void InstrumentationRuntimeASan::Terminate() {

  PluginManager::UnregisterPlugin(CreateInstance);

}



lldb_private::ConstString AddressSanitizerRuntime::GetPluginNameStatic() {

lldb_private::ConstString InstrumentationRuntimeASan::GetPluginNameStatic() {

  return ConstString("AddressSanitizer");

}



lldb::InstrumentationRuntimeType AddressSanitizerRuntime::GetTypeStatic() {

lldb::InstrumentationRuntimeType InstrumentationRuntimeASan::GetTypeStatic() {

  return eInstrumentationRuntimeTypeAddressSanitizer;

}



AddressSanitizerRuntime::~AddressSanitizerRuntime() { Deactivate(); }

InstrumentationRuntimeASan::~InstrumentationRuntimeASan() { Deactivate(); }



const RegularExpression &

AddressSanitizerRuntime::GetPatternForRuntimeLibrary() {

InstrumentationRuntimeASan::GetPatternForRuntimeLibrary() {

  // FIXME: This shouldn't include the "dylib" suffix.

  static RegularExpression regex(

      llvm::StringRef("libclang_rt.asan_(.*)_dynamic\\.dylib"));

  return regex;

}



bool AddressSanitizerRuntime::CheckIfRuntimeIsValid(

bool InstrumentationRuntimeASan::CheckIfRuntimeIsValid(

    const lldb::ModuleSP module_sp) {

  const Symbol *symbol = module_sp->FindFirstSymbolWithNameAndType(

      ConstString("__asan_get_alloc_stack"), lldb::eSymbolTypeAny);
@@ -108,7 +108,7 @@ t.description = __asan_get_report_description(); 
t

)";



StructuredData::ObjectSP AddressSanitizerRuntime::RetrieveReportData() {

StructuredData::ObjectSP InstrumentationRuntimeASan::RetrieveReportData() {

  ProcessSP process_sp = GetProcessSP();

  if (!process_sp)

    return StructuredData::ObjectSP();
@@ -189,7 +189,7 @@ StructuredData::ObjectSP AddressSanitizerRuntime::RetrieveReportData() { 
}



std::string

AddressSanitizerRuntime::FormatDescription(StructuredData::ObjectSP report) {

InstrumentationRuntimeASan::FormatDescription(StructuredData::ObjectSP report) {

  std::string description = report->GetAsDictionary()

                                ->GetValueForKey("description")

                                ->GetAsString()
@@ -235,15 +235,15 @@ AddressSanitizerRuntime::FormatDescription(StructuredData::ObjectSP report) { 
      .Default("AddressSanitizer detected: " + description);

}



bool AddressSanitizerRuntime::NotifyBreakpointHit(

bool InstrumentationRuntimeASan::NotifyBreakpointHit(

    void *baton, StoppointCallbackContext *context, user_id_t break_id,

    user_id_t break_loc_id) {

  assert(baton && "null baton");

  if (!baton)

    return false;



  AddressSanitizerRuntime *const instance =

      static_cast<AddressSanitizerRuntime *>(baton);

  InstrumentationRuntimeASan *const instance =

      static_cast<InstrumentationRuntimeASan *>(baton);



  ProcessSP process_sp = instance->GetProcessSP();
@@ -275,7 +275,7 @@ bool AddressSanitizerRuntime::NotifyBreakpointHit( 
    return false; // Let target run

}



void AddressSanitizerRuntime::Activate() {

void InstrumentationRuntimeASan::Activate() {

  if (IsActive())

    return;
@@ -305,7 +305,7 @@ void AddressSanitizerRuntime::Activate() { 
      process_sp->GetTarget()

          .CreateBreakpoint(symbol_address, internal, hardware)

          .get();

  breakpoint->SetCallback(AddressSanitizerRuntime::NotifyBreakpointHit, this,

  breakpoint->SetCallback(InstrumentationRuntimeASan::NotifyBreakpointHit, this,

                          true);

  breakpoint->SetBreakpointKind("address-sanitizer-report");

  SetBreakpointID(breakpoint->GetID());
@@ -313,7 +313,7 @@ void AddressSanitizerRuntime::Activate() { 
  SetActive(true);

}



void AddressSanitizerRuntime::Deactivate() {

void InstrumentationRuntimeASan::Deactivate() {

  if (GetBreakpointID() != LLDB_INVALID_BREAK_ID) {

    ProcessSP process_sp = GetProcessSP();

    if (process_sp) {

lldb/source/Plugins/InstrumentationRuntime/ASan/ASanRuntime.h→lldb/source/Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.h

+4 −4
Original line number Diff line number Diff line 
//===-- ASanRuntime.h -------------------------------------------*- C++ -*-===//

//===-- InstrumentationRuntimeASan.h ----------------------------*- C++ -*-===//

//

// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.

// See https://llvm.org/LICENSE.txt for license information.
@@ -16,9 +16,9 @@ 


namespace lldb_private {



class AddressSanitizerRuntime : public lldb_private::InstrumentationRuntime {

class InstrumentationRuntimeASan : public lldb_private::InstrumentationRuntime {

public:

  ~AddressSanitizerRuntime() override;

  ~InstrumentationRuntimeASan() override;



  static lldb::InstrumentationRuntimeSP

  CreateInstance(const lldb::ProcessSP &process_sp);
@@ -40,7 +40,7 @@ public: 
  uint32_t GetPluginVersion() override { return 1; }



private:

  AddressSanitizerRuntime(const lldb::ProcessSP &process_sp)

  InstrumentationRuntimeASan(const lldb::ProcessSP &process_sp)

      : lldb_private::InstrumentationRuntime(process_sp) {}



  const RegularExpression &GetPatternForRuntimeLibrary() override;

lldb/tools/lldb-test/SystemInitializerTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
#include "Plugins/Instruction/MIPS/EmulateInstructionMIPS.h"

#include "Plugins/Instruction/MIPS64/EmulateInstructionMIPS64.h"

#include "Plugins/Instruction/PPC64/EmulateInstructionPPC64.h"

#include "Plugins/InstrumentationRuntime/ASan/ASanRuntime.h"

#include "Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.h"

#include "Plugins/InstrumentationRuntime/MainThreadChecker/MainThreadCheckerRuntime.h"

#include "Plugins/InstrumentationRuntime/TSan/TSanRuntime.h"

#include "Plugins/InstrumentationRuntime/UBSan/UBSanRuntime.h"
@@ -193,7 +193,7 @@ llvm::Error SystemInitializerTest::Initialize() { 
  ProcessMachCore::Initialize();

  minidump::ProcessMinidump::Initialize();

  MemoryHistoryASan::Initialize();

  AddressSanitizerRuntime::Initialize();

  InstrumentationRuntimeASan::Initialize();

  ThreadSanitizerRuntime::Initialize();

  UndefinedBehaviorSanitizerRuntime::Initialize();

  MainThreadCheckerRuntime::Initialize();
@@ -286,7 +286,7 @@ void SystemInitializerTest::Terminate() { 
  ProcessMachCore::Terminate();

  minidump::ProcessMinidump::Terminate();

  MemoryHistoryASan::Terminate();

  AddressSanitizerRuntime::Terminate();

  InstrumentationRuntimeASan::Terminate();

  ThreadSanitizerRuntime::Terminate();

  UndefinedBehaviorSanitizerRuntime::Terminate();

  MainThreadCheckerRuntime::Terminate();