| OLD | NEW |
| 1 // Copyright (c) 2010 Google Inc. | 1 // Copyright (c) 2010 Google Inc. |
| 2 // All rights reserved. | 2 // All rights reserved. |
| 3 // | 3 // |
| 4 // Redistribution and use in source and binary forms, with or without | 4 // Redistribution and use in source and binary forms, with or without |
| 5 // modification, are permitted provided that the following conditions are | 5 // modification, are permitted provided that the following conditions are |
| 6 // met: | 6 // met: |
| 7 // | 7 // |
| 8 // * Redistributions of source code must retain the above copyright | 8 // * Redistributions of source code must retain the above copyright |
| 9 // notice, this list of conditions and the following disclaimer. | 9 // notice, this list of conditions and the following disclaimer. |
| 10 // * Redistributions in binary form must reproduce the above | 10 // * Redistributions in binary form must reproduce the above |
| (...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 410 return_value = *qualified_name; | 410 return_value = *qualified_name; |
| 411 } else if (unqualified_name && enclosing_name) { | 411 } else if (unqualified_name && enclosing_name) { |
| 412 // Combine the enclosing name and unqualified name to produce our | 412 // Combine the enclosing name and unqualified name to produce our |
| 413 // own fully-qualified name. | 413 // own fully-qualified name. |
| 414 return_value = cu_context_->language->MakeQualifiedName(*enclosing_name, | 414 return_value = cu_context_->language->MakeQualifiedName(*enclosing_name, |
| 415 *unqualified_name); | 415 *unqualified_name); |
| 416 } | 416 } |
| 417 | 417 |
| 418 // If this DIE was marked as a declaration, record its names in the | 418 // If this DIE was marked as a declaration, record its names in the |
| 419 // specification table. | 419 // specification table. |
| 420 if (declaration_ && qualified_name || (unqualified_name && enclosing_name)) { | 420 if ((declaration_ && qualified_name) || |
| 421 (unqualified_name && enclosing_name)) { |
| 421 Specification spec; | 422 Specification spec; |
| 422 if (qualified_name) { | 423 if (qualified_name) { |
| 423 spec.qualified_name = *qualified_name; | 424 spec.qualified_name = *qualified_name; |
| 424 } else { | 425 } else { |
| 425 spec.enclosing_name = *enclosing_name; | 426 spec.enclosing_name = *enclosing_name; |
| 426 spec.unqualified_name = *unqualified_name; | 427 spec.unqualified_name = *unqualified_name; |
| 427 } | 428 } |
| 428 cu_context_->file_context->file_private_->specifications[offset_] = spec; | 429 cu_context_->file_context->file_private_->specifications[offset_] = spec; |
| 429 } | 430 } |
| 430 | 431 |
| (...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1065 return dwarf_version >= 2; | 1066 return dwarf_version >= 2; |
| 1066 } | 1067 } |
| 1067 | 1068 |
| 1068 bool DwarfCUToModule::StartRootDIE(uint64 offset, enum DwarfTag tag) { | 1069 bool DwarfCUToModule::StartRootDIE(uint64 offset, enum DwarfTag tag) { |
| 1069 // We don't deal with partial compilation units (the only other tag | 1070 // We don't deal with partial compilation units (the only other tag |
| 1070 // likely to be used for root DIE). | 1071 // likely to be used for root DIE). |
| 1071 return tag == dwarf2reader::DW_TAG_compile_unit; | 1072 return tag == dwarf2reader::DW_TAG_compile_unit; |
| 1072 } | 1073 } |
| 1073 | 1074 |
| 1074 } // namespace google_breakpad | 1075 } // namespace google_breakpad |
| OLD | NEW |