aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party/ijar/classfile.cc
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2015-08-24 13:26:23 +0000
committerGravatar Han-Wen Nienhuys <hanwen@google.com>2015-08-24 14:13:34 +0000
commitcec2222df4384527199a163922970ff5acf50ab7 (patch)
tree0f9d8e6c4b5b0cda64cea81b6f3d4db755cd6bf0 /third_party/ijar/classfile.cc
parentc6fd0b6ec67a7844ea95ca416ca6d94b0ced2086 (diff)
Correctly process "ScalaInlineInfo" attribute. This is new in Scala 2.11.7 (and 2.12).
-- MOS_MIGRATED_REVID=101358929
Diffstat (limited to 'third_party/ijar/classfile.cc')
-rw-r--r--third_party/ijar/classfile.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/third_party/ijar/classfile.cc b/third_party/ijar/classfile.cc
index 7be3ccef79..39d24f9dd4 100644
--- a/third_party/ijar/classfile.cc
+++ b/third_party/ijar/classfile.cc
@@ -1205,7 +1205,9 @@ void HasAttrs::ReadAttrs(const u1 *&p) {
attr_name == "RuntimeInvisibleParameterAnnotations") {
attributes.push_back(
ParameterAnnotationsAttribute::Read(p, attribute_name));
- } else if (attr_name == "Scala" || attr_name == "ScalaSig") {
+ } else if (attr_name == "Scala" ||
+ attr_name == "ScalaSig" ||
+ attr_name == "ScalaInlineInfo") {
// These are opaque blobs, so can be handled with a general
// attribute handler
attributes.push_back(GeneralAttribute::Read(p, attribute_name,