dwarflint: Publish C dwarf pointer in high-level checks

diff --git a/dwarflint/highlevel_check.cc b/dwarflint/highlevel_check.cc
index 8e1db6d4620db56aef8d4cfae5d422cbee503932..fefc727b6df572708adec459a4b654af4beb9ddf 100644 (file)
--- a/dwarflint/highlevel_check.cc
+++ b/dwarflint/highlevel_check.cc
@@ -1,5 +1,5 @@
 /* Initialization of high-level check context
-   Copyright (C) 2009 Red Hat, Inc.
+   Copyright (C) 2009, 2010 Red Hat, Inc.
    This file is part of Red Hat elfutils.
 
    Red Hat elfutils is free software; you can redistribute it and/or modify
@@ -134,8 +134,8 @@ namespace
 open_highlevel_dwarf::open_highlevel_dwarf (checkstack &stack, dwarflint &lint)
   : _m_dwfl ((lint.check<lowlevel_checks> (stack),
              open_dwfl ()))
-  , _m_dw (open_dwarf (_m_dwfl, lint.fname (), lint.fd ()))
-  , dw (open_hl_dwarf (_m_dw))
+  , c_dw (open_dwarf (_m_dwfl, lint.fname (), lint.fd ()))
+  , dw (open_hl_dwarf (c_dw))
 {}
 
 open_highlevel_dwarf::~open_highlevel_dwarf ()

diff --git a/dwarflint/highlevel_check.hh b/dwarflint/highlevel_check.hh
index 7fb7b128afca4f56e36e3eedf60d0c3ce7e567a0..4c3bb72550d87560e893ffb8d4225234102ea7c2 100644 (file)
--- a/dwarflint/highlevel_check.hh
+++ b/dwarflint/highlevel_check.hh
@@ -38,13 +38,13 @@ class open_highlevel_dwarf
   : public check<open_highlevel_dwarf>
 {
   Dwfl *const _m_dwfl;
-  Dwarf *const _m_dw;
 public:
   static checkdescriptor const *descriptor () {
     static checkdescriptor cd ("open_highlevel_dwarf");
     return &cd;
   }
 
+  Dwarf *const c_dw;
   elfutils::dwarf const dw;
   open_highlevel_dwarf (checkstack &stack, dwarflint &lint);
   ~open_highlevel_dwarf ();
@@ -63,10 +63,12 @@ public:
     return &cd;
   }
 
+  Dwarf *const c_dw;
   elfutils::dwarf const &dw;
 
-  explicit highlevel_check (checkstack &stack, dwarflint &lint)
+  highlevel_check (checkstack &stack, dwarflint &lint)
     : _m_loader (lint.check (stack, _m_loader))
+    , c_dw (_m_loader->c_dw)
     , dw (_m_loader->dw)
   {}
 };