llvm-project/lldb/source/API/SBFileSpec.cpp
Greg Clayton 274060b6f1 Fixed an issue where we were resolving paths when we should have been.
So the issue here was that we have lldb_private::FileSpec that by default was 
always resolving a path when using the:

FileSpec::FileSpec (const char *path);

and in the:

void FileSpec::SetFile(const char *pathname, bool resolve = true);

This isn't what we want in many many cases. One example is you have "/tmp" on
your file system which is really "/private/tmp". You compile code in that
directory and end up with debug info that mentions "/tmp/file.c". Then you 
type:

(lldb) breakpoint set --file file.c --line 5

If your current working directory is "/tmp", then "file.c" would be turned 
into "/private/tmp/file.c" which won't match anything in the debug info.
Also, it should have been just a FileSpec with no directory and a filename
of "file.c" which could (and should) potentially match any instances of "file.c"
in the debug info.

So I removed the constructor that just takes a path:

FileSpec::FileSpec (const char *path); // REMOVED

You must now use the other constructor that has a "bool resolve" parameter that you must always supply:

FileSpec::FileSpec (const char *path, bool resolve);

I also removed the default parameter to SetFile():

void FileSpec::SetFile(const char *pathname, bool resolve);

And fixed all of the code to use the right settings.

llvm-svn: 116944
2010-10-20 20:54:39 +00:00

167 lines
3.2 KiB
C++

//===-- SBFileSpec.cpp ------------------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
#include "lldb/API/SBFileSpec.h"
#include "lldb/API/SBStream.h"
#include "lldb/Core/FileSpec.h"
using namespace lldb;
using namespace lldb_private;
SBFileSpec::SBFileSpec () :
m_opaque_ap()
{
}
SBFileSpec::SBFileSpec (const SBFileSpec &rhs) :
m_opaque_ap()
{
if (rhs.m_opaque_ap.get())
m_opaque_ap.reset (new FileSpec (rhs.get()));
}
// Deprected!!!
SBFileSpec::SBFileSpec (const char *path) :
m_opaque_ap(new FileSpec (path, true))
{
}
SBFileSpec::SBFileSpec (const char *path, bool resolve) :
m_opaque_ap(new FileSpec (path, resolve))
{
}
SBFileSpec::~SBFileSpec ()
{
}
const SBFileSpec &
SBFileSpec::operator = (const SBFileSpec &rhs)
{
if (this != &rhs)
{
if (rhs.IsValid())
m_opaque_ap.reset (new lldb_private::FileSpec(*rhs.m_opaque_ap.get()));
}
return *this;
}
bool
SBFileSpec::IsValid() const
{
return m_opaque_ap.get() != NULL;
}
bool
SBFileSpec::Exists () const
{
if (m_opaque_ap.get())
return m_opaque_ap->Exists();
return false;
}
bool
SBFileSpec::ResolveExecutableLocation ()
{
if (m_opaque_ap.get())
return m_opaque_ap->ResolveExecutableLocation ();
return false;
}
int
SBFileSpec::ResolvePath (const char *src_path, char *dst_path, size_t dst_len)
{
return lldb_private::FileSpec::Resolve (src_path, dst_path, dst_len);
}
const char *
SBFileSpec::GetFilename() const
{
if (m_opaque_ap.get())
return m_opaque_ap->GetFilename().AsCString();
return NULL;
}
const char *
SBFileSpec::GetDirectory() const
{
if (m_opaque_ap.get())
return m_opaque_ap->GetDirectory().AsCString();
return NULL;
}
uint32_t
SBFileSpec::GetPath (char *dst_path, size_t dst_len) const
{
if (m_opaque_ap.get())
return m_opaque_ap->GetPath (dst_path, dst_len);
if (dst_path && dst_len)
*dst_path = '\0';
return 0;
}
const lldb_private::FileSpec *
SBFileSpec::operator->() const
{
return m_opaque_ap.get();
}
const lldb_private::FileSpec *
SBFileSpec::get() const
{
return m_opaque_ap.get();
}
const lldb_private::FileSpec &
SBFileSpec::operator*() const
{
return *m_opaque_ap.get();
}
const lldb_private::FileSpec &
SBFileSpec::ref() const
{
return *m_opaque_ap.get();
}
void
SBFileSpec::SetFileSpec (const lldb_private::FileSpec& fs)
{
if (m_opaque_ap.get())
*m_opaque_ap = fs;
else
m_opaque_ap.reset (new FileSpec (fs));
}
bool
SBFileSpec::GetDescription (SBStream &description)
{
if (m_opaque_ap.get())
{
const char *filename = GetFilename();
const char *dir_name = GetDirectory();
if (!filename && !dir_name)
description.Printf ("No value");
else if (!dir_name)
description.Printf ("%s", filename);
else
description.Printf ("%s/%s", dir_name, filename);
}
else
description.Printf ("No value");
return true;
}