nagachika	2013-07-20 23:45:51 +0900 (Sat, 20 Jul 2013)

  New Revision: 42089

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=42089

  Log:
    merge revision(s) 40334: [Backport #8149]
    
    * iseq.c (iseq_location_setup): re-use existing string when iseq has
      the same path and absolute_path. [Bug #8149]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/iseq.c
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 42088)
+++ ruby_2_0_0/ChangeLog	(revision 42089)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Jul 20 23:31:11 2013  Aman Gupta  <tmm1@r...>
+
+	* iseq.c (iseq_location_setup): re-use existing string when iseq has
+	  the same path and absolute_path. [Bug #8149]
+
 Sun Jul 14 00:18:08 2013  Zachary Scott  <e@z...>
 
 	* sprintf.c: Fix typo patch by @hynkle [Fixes GH-357]
Index: ruby_2_0_0/iseq.c
===================================================================
--- ruby_2_0_0/iseq.c	(revision 42088)
+++ ruby_2_0_0/iseq.c	(revision 42089)
@@ -188,7 +188,10 @@ iseq_location_setup(rb_iseq_t *iseq, VAL https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/iseq.c#L188
 {
     rb_iseq_location_t *loc = &iseq->location;
     loc->path = path;
-    loc->absolute_path = absolute_path;
+    if (RTEST(absolute_path) && rb_str_cmp(path, absolute_path) == 0)
+	loc->absolute_path = path;
+    else
+	loc->absolute_path = absolute_path;
     loc->label = loc->base_label = name;
     loc->first_lineno = first_lineno;
     return loc;
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 42088)
+++ ruby_2_0_0/version.h	(revision 42089)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-07-20"
-#define RUBY_PATCHLEVEL 271
+#define RUBY_PATCHLEVEL 272
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 7

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40334


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/