[llvm] r328593 - Move CVDebugRecord from CodeView to Object to fix layering

[David Blaikie via llvm-commits]

Author: dblaikie
Date: Mon Mar 26 16:37:02 2018
New Revision: 328593

URL: http://llvm.org/viewvc/llvm-project?rev=328593&view=rev
Log:
Move CVDebugRecord from CodeView to Object to fix layering

Added:
    llvm/trunk/include/llvm/Object/CVDebugRecord.h
      - copied, changed from r328592, llvm/trunk/include/llvm/DebugInfo/CodeView/CVDebugRecord.h
Removed:
    llvm/trunk/include/llvm/DebugInfo/CodeView/CVDebugRecord.h
Modified:
    llvm/trunk/include/llvm/Object/COFF.h

Removed: llvm/trunk/include/llvm/DebugInfo/CodeView/CVDebugRecord.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/DebugInfo/CodeView/CVDebugRecord.h?rev=328592&view=auto
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/CodeView/CVDebugRecord.h (original)
+++ llvm/trunk/include/llvm/DebugInfo/CodeView/CVDebugRecord.h (removed)
@@ -1,55 +0,0 @@
-//===- CVDebugRecord.h ------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_DEBUGINFO_CODEVIEW_CVDEBUGRECORD_H
-#define LLVM_DEBUGINFO_CODEVIEW_CVDEBUGRECORD_H
-
-#include "llvm/Support/Endian.h"
-
-namespace llvm {
-namespace OMF {
-struct Signature {
-  enum ID : uint32_t {
-    PDB70 = 0x53445352, // RSDS
-    PDB20 = 0x3031424e, // NB10
-    CV50 = 0x3131424e,  // NB11
-    CV41 = 0x3930424e,  // NB09
-  };
-
-  support::ulittle32_t CVSignature;
-  support::ulittle32_t Offset;
-};
-}
-
-namespace codeview {
-struct PDB70DebugInfo {
-  support::ulittle32_t CVSignature;
-  uint8_t Signature[16];
-  support::ulittle32_t Age;
-  // char PDBFileName[];
-};
-
-struct PDB20DebugInfo {
-  support::ulittle32_t CVSignature;
-  support::ulittle32_t Offset;
-  support::ulittle32_t Signature;
-  support::ulittle32_t Age;
-  // char PDBFileName[];
-};
-
-union DebugInfo {
-  struct OMF::Signature Signature;
-  struct PDB20DebugInfo PDB20;
-  struct PDB70DebugInfo PDB70;
-};
-}
-}
-
-#endif
-

Modified: llvm/trunk/include/llvm/Object/COFF.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/COFF.h?rev=328593&r1=328592&r2=328593&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Object/COFF.h (original)
+++ llvm/trunk/include/llvm/Object/COFF.h Mon Mar 26 16:37:02 2018
@@ -16,9 +16,9 @@
 
 #include "llvm/ADT/iterator_range.h"
 #include "llvm/BinaryFormat/COFF.h"
-#include "llvm/DebugInfo/CodeView/CVDebugRecord.h"
 #include "llvm/MC/SubtargetFeature.h"
 #include "llvm/Object/Binary.h"
+#include "llvm/Object/CVDebugRecord.h"
 #include "llvm/Object/Error.h"
 #include "llvm/Object/ObjectFile.h"
 #include "llvm/Support/BinaryByteStream.h"

Copied: llvm/trunk/include/llvm/Object/CVDebugRecord.h (from r328592, llvm/trunk/include/llvm/DebugInfo/CodeView/CVDebugRecord.h)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Object/CVDebugRecord.h?p2=llvm/trunk/include/llvm/Object/CVDebugRecord.h&p1=llvm/trunk/include/llvm/DebugInfo/CodeView/CVDebugRecord.h&r1=328592&r2=328593&rev=328593&view=diff
==============================================================================
--- llvm/trunk/include/llvm/DebugInfo/CodeView/CVDebugRecord.h (original)
+++ llvm/trunk/include/llvm/Object/CVDebugRecord.h Mon Mar 26 16:37:02 2018
@@ -7,8 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_DEBUGINFO_CODEVIEW_CVDEBUGRECORD_H
-#define LLVM_DEBUGINFO_CODEVIEW_CVDEBUGRECORD_H
+#ifndef LLVM_OBJECT_CVDEBUGRECORD_H
+#define LLVM_OBJECT_CVDEBUGRECORD_H
 
 #include "llvm/Support/Endian.h"